new feature in development
Merge branch 'master' into development

Conflicts:
	README.md
Merge branch 'development'