Merge branch 'issue-14' into develop

Conflicts:
	composer.json