commit to dev
Merge branch 'dev'

Conflicts:
	README.md