fixes #69 fixes #68:
fixes #70
Merge branch 'master' into gh-pages