fixes #11
fixed #9, and fixed #10
bumped version
Merge branch 'release/1.1.31' into develop