more changes on dev branch
Merge branch 'patrick.stephen_dev'

Conflicts:
	README.md