Composer
Merge pull request #134 from luka8088/master

Composer json