Review 17-1
Merge pull request #277 from objccn/review/issue-17-1

Review 17-1