Merge pull request #40 from computersalat/special_chars