nwe
Merge branch 'release/0.3.4'

Conflicts:
	composer.json