Chris Morgan : Fix parsing errors by escapting apostophes added inside of strings