TUP-2, TUP-4 Implementation for maim
Merge branch 'master' of https://github.com/xjguo/miam.git
Merge branch 'master' of https://github.com/xjguo/miam.git