label fix
Enhanced MappingUtil
Merge pull request #42 from chidakiyo/feature/MappingUtil_Label_fix

Feature/mapping util label fix