remove CharT template option, so much for header only
Merge remote-tracking branch 'origin/simplify' into simplify