Reviewed
Merge pull request #257 from objccn/review/16-1-onevcat

Reviewed