Merge pull request #9 from PamelaBeatriz/master

Merge pull request from orlando/master