Fixed composer.json syntax
Better target-dir
Merge remote-tracking branch 'origin/pr/46'