Added more special characters
Merge branch 'master' of github.com:ChrisKaufmann/totools