Merge pull request #258 from christav/dev

Table: Reduce characters that get encoded to just illegal in XML ones