Merge pull request #4 from ustroetz/master

update
Merge pull request #6 from ustroetz/gh-pages

Merge pull request #4 from ustroetz/master