Merge pull request #10 from oeon/gh-pages

Merge pull request #9 from oeon/master
Merge pull request #11 from oeon/master

Merge pull request #10 from oeon/gh-pages