Merge pull request #11 from PamelaBeatriz/master

Merge pull request from orlando/master