Fixed the previously-mentioned remaining bug on handling special symbols, I think.
Merge pull request #214 from sprowell/master

Fixed the previously-mentioned remaining bug on handling special symbols...