Merge branch 'hotfix/0.3.1'
Bumped version
Merge branch 'hotfix/0.3.2' into develop

Conflicts:
	setup.py