Merge pull request #2 from Carlows/master

sad
Merge pull request #3 from Carlows/carlos-branch

Merge pull request #2 from Carlows/master