Merge branch 'gh-pages'
Fixes issue #87
Merge branch 'master' into gh-pages