Merge pull request #7 from PamelaBeatriz/master

Merge pull request from orlando/master
Merge pull request #8 from PamelaBeatriz/orlando

Merge pull request #7 from PamelaBeatriz/master