fix TypeDLog
fix compile error
convert code
Merge branch 'master' into tsuji