Initial commit
Merge branch 'master' into development

Conflicts:
	README.md