Updated CHANGELOG to v0.4
Merge origin/v0.4 into v0.4

Conflicts:
	CHANGELOG.md