fixes #72 fixes #73
Merge branch 'master' into gh-pages