Small fix
version update
Merge remote-tracking branch 'origin/master'

Conflicts:
	version.txt