add convertType
Merge remote-tracking branch 'origin/master'
add convertType kotlin
fix scala syntax