US1490
code review fixes #1
Merge pull request #2 from azailin/feature-3

Feature 3