Merge branch 'develop'

Conflicts:
	setup.py