Version 1.0.4
Merge branch 'master' into dev

Conflicts:
	readme.txt