Prepare version 0.3.3
Merge branch '0.3'

Conflicts:
	CHANGELOG.md