Bug fixes
Merge pull request #1 from snakerock/gh-pages

Bug fixes