version change
Merge branch 'release/v0.2.1'

Conflicts:
	setup.py