patch for first review
Merge pull request #1 from crdlc/review

Patch for first Jose's review