Fix issue #93
Merge branch 'master' into gh-pages