Fix #13 Invalid Characters now escaped