Merge pull request #1 from eacevedo/2.0

config change
Merge pull request #2 from eacevedo/2.0

config change
Update composer.json
Merge pull request #3 from eacevedo/master

config change