some merge
fix next tickets
Merge https://github.com/minardi/mts-dip