release stable version 0.6
Merge branch 'develop' -> release 0.7

Conflicts:
	setup.py