Revised special character pull request

Based on the following pull request: 7d9311d7d4617201e5118cfbf2e984ee860dcad8

@simeydotme