Composer and "use" tweak
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json
	example/index.php