update the solution
SubCategory Is now supported
Working Version
Merge branch 'master'