Update CHANGELOG.md
Merge branch 'release/v0.1.4'

Conflicts:
	CHANGELOG.md
Correct Changelog for 0.1.4