bump version
Merge branch 'develop' into release_0.1.0

Conflicts:
	setup.py