Merge pull request #12 from silshack/gh-pages

update to master
Merge pull request #348 from gerbal/gh-pages

Merge pull request #12 from silshack/gh-pages - lets see if this fixes the page build errors