Merge pull request #7 from labyrwa/master

Merge with master
Merge pull request #8 from labyrwa/gh-pages

Merge pull request #7 from labyrwa/master