Merge branch 'gh-pages', remote-tracking branch 'origin'
Bug fixes

7 bugs squashed!