some fix
Merge https://github.com/minardi/mts-dip
Fix router
Merge https://github.com/minardi/mts-dip