Merge branch 'master' into gh-pages
bugfix
Merge branch 'gh-pages'