Added charset test
Merge branch 'master' into fix-charset
Cleanup
Added mono_string to string converters, requires testing
Cleanup