Merge pull request #1 from kraihn/dev

Dev
Flat hotfix without extras
Merge branch 'qa-merged-conflict' into dev-merged-conflict

Conflicts:
	README.md