Merge pull request #32 from oeon/master

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

Merge pull request #32 from oeon/master