rramadeu Merge pull request #38 from rramadeu/master