Merge pull request #299 from spekary/feature-v3-update

Feature v3 update
Composer.json picked from composer feature