Version 0.4.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt
Version 0.4.0