Merge pull request #1 from abstractOwl/master

Update gh-pages with master