Review for 17-2
Merge pull request #275 from objccn/review/issue-17-2-onevcat

Review for 17-2