refactor weekly
Merge https://github.com/minardi/mts-dip
hi, dear userEx