fixes#17
fixes #17
fixes #28
fixes #61
Merge branch 'master' into gh-pages