add adapation module need to futher modify
fix bugs
Merge branch 'master' into alloNotEvo