Merge branch 'release/0.23.0' into develop
Fixes issue #101 (at least the part we think is fixable).
Bump version up to 0.23.1
Merge branch 'release/0.23.1'