Released 0.3.1
Merge branch 'master' into develop

Conflicts:
	composer.json
Updated dependencies