Review 15-7
Change file name
fix issue 15-7
Merge pull request #239 from objccn/review/15-7-onevcat

Review/15 7 onevcat