Merge pull request #28 from oeon/master

''
Merge pull request #29 from oeon/gh-pages

Merge pull request #28 from oeon/master