Updates
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	CHANGELOG.md
	README.md