4025 Ignore tildes and hyphens
Merge pull request #1719 from sarken/issue_4025

4025 Ignore tildes and hyphens