mapper trim issues
Merge branch 'dev2' of https://github.com/Innostark/Cares into dev2