WIP
Fixes
Merge pull request #1 from basvasilich/gh-pages

Fixes