dev2 changes
Merge branch 'dev2'

Conflicts:
	README.md