#36 related
Merged changes from 0.7.5
Fixed version number
Merge master
Closes #36
Fixes 50
Closes #47
Fixes #51, Closes #48
Final commit on this branch