Fixes #69
Fixes #70
Fixes #68
Merge pull request #71 from jmdobry/0.9.1

0.9.1