Apply code review
Merge pull request #749 from andrerod/dev

Apply code review