Some small fixes
And another one
Merge branch 'pull-master'

Conflicts:
	readme.txt