Review for 14-5
Merge pull request #222 from objccn/review/14-5-onevcat

Review for 14-5