Change contact info and make minor fixes
Merge pull request #6 from xarisd/shape-up

Change contact info and make minor fixes