version bump in setup.py
Merge branch 'release/v0.3.1' into develop