Merge pull request #1 from abstractOwl/master

Update gh-pages with master
Merge pull request #2 from abstractOwl/gh-pages

Merge pull request #1 from abstractOwl/master