Merge pull request #2 from oeon/master

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

Merge pull request #2 from oeon/master