Apply code Review
Merge pull request #753 from andrerod/dev

Apply code Review