Reviewed
Merge pull request #290 from objccn/review/18-4-onevcat

Reviewed