Merge pull request #1 from Andrea-Paz/master