Handle C++11 string types
Add chars
Fix
Fix
Update