code review
Merge pull request #1 from jcarsique/master

code review