Merge branch 'fix_v3.1.1_issues' into 'master'

Fix v3.1.1 issues

Closes #4, #9, #12, and #13

See merge request !4
3 jobs for v1.8.0rc4 in 12 minutes and 13 seconds (queued for 1 second)
latest