Adjusted composer
Merge pull request #43 from inspiran/refactor

Adjusted composer