Merge pull request #11 from PamelaBeatriz/master

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

Merge pull request #11 from PamelaBeatriz/master