yh-196 added fields and testing license list
yh196 2 licenses yh-246 bug fixed
Merge branch 'yh-196'