Applying code review
Merge pull request #354 from andrerod/dev

Applying code review