updated in develop...
Merge branch 'develop'

Conflicts:
	.DS_Store
	README.md