merge
Merge branch 'master' of https://github.com/Overu/conversion.git
modify adapter