Hotfix 0.1.1
Merge branch 'Develop' into Hotfixes

Conflicts:
	README.md

First merge
Merge branch 'Hotfixes' into Develop