Merge branch 'develop'

Conflicts:
	README.markdown