augusto-garcia Merge pull request #40 from Cristianetaniguti/master