Merge pull request #15 from xasos/master

Cleanup
Merge pull request #16 from xasos/gh-pages

Merge pull request #15 from xasos/master