Merge pull request #14 from oeon/gh-pages

Merge pull request #13 from oeon/master
Merge pull request #15 from oeon/master

Merge pull request #14 from oeon/gh-pages