Fix issue #89
Fix issue #91
Fix issue #59
Fixed typo
Merge branch 'master' into gh-pages