add to_type and some other files
Merge remote-tracking branch 'origin/master'