Current User work
Merge https://github.com/minardi/mts-dip
Fiwed style
Merge https://github.com/minardi/mts-dip