Reviewed 18-3
Merge pull request #293 from objccn/review/issue-18-3

Reviewed 18-3