Cleanup and Fixes
Merge pull request #28 from pathumego/gh-pages

Cleanup and Fixes