Merge branch 'HotFix'
1.0.0.3
1.0.0.4
Merge branch 'master' into HotFix

Conflicts:
	README.md