First commit in dev branch
hotfix changes
merging with development
Merge branch 'hotfix'

Conflicts:
	README.md