Merge pull request #3 from oscargerbert/Oscar

Merge pull request #2 from oscargerbert/Andrea