fixed c_str semantics

just updating things to master