Merge pull request #26 from vgarvardt/master

Many fixes and improvements
updated requirements
Update composer.json
require dev-master versions