implement constructor
fix conflic
Merge branch 'master' of https://github.com/plv-talend/miam