Merge pull request #7 from PamelaBeatriz/master

Merge pull request from orlando/master