Merge pull request #2 from Butsco/master

Small improvements
Merge pull request #3 from Butsco/gh-pages

Merge pull request #2 from Butsco/master