crucial fixes
Merge http://github.com/minardi/mts-dip