Version 1.0.4
Merge branch 'master' into dev

Conflicts:
	readme.txt
Version 1.0.5
Version 1.0.5
Merge branch 'dev'