CS fix
Released 1.0.1
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	CHANGELOG.md