zwzhao commit
Merge branch 'master' of https://github.com/wchen-talend/miam.git