Fixed a minor issue in the clean function
Merge branch 'master' into 1.1-wip

Conflicts:
	CHANGELOG.md
Updated change log