Merge pull request #16 from WriteOrRead/master

update mapping
update composer.json to use vespolina/molino