finish TUP-7
Merge branch 'master' of https://github.com/wwang-talend/miam.git