Merge pull request #12 from PamelaBeatriz/orlando

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