Merge pull request #19 from Surt/develop

Merge from develop v2.0
Update composer.json
Update composer.json
Merge pull request #20 from Surt/master

Merge