work in newfeature branch
Merge branch 'newfeature'

Conflicts:
	README.md