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