type
Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'develop'
Merge branch 'develop'
setup.py chatnge