merge and modify encoding
updates
Merge remote-tracking branch 'origin/furukawa' into nakata
modifed to display support map