Composer fix
Fix composer
Merge branch 'v1.0' into v1.1

Conflicts:
	composer.json