Review for 15-2
Merge pull request #246 from objccn/review/15-2-onevcat

Review for 15-2