fixes #64
fixes #63
fixes #65
fixes #66
fixes #62
Merge branch 'master' into gh-pages