trying'
Cleanup iconv stuff
Merge resolved