Merge pull request #10 from PamelaBeatriz/orlando

Merge pull request #9 from PamelaBeatriz/master
Merge remote-tracking branch 'origin/orlando'
Merge pull request #11 from PamelaBeatriz/master

Merge pull request from orlando/master