updated from branch-2
Merge branch 'branch-2' into dev

Conflicts:
	README.md