Special characters are now handled by TC

Fix #341
Merge remote-tracking branch 'refs/remotes/origin/master'