federicocasares Merge pull request #3 from Alexitaly92/master