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