Merge develop into master for v0.9.1 release
#50
Merged
develop into master for v0.9.1 release
#50