Fix to #4
Fix the regex to handle other chars than letters and numbers
Merge pull request #5 from AntonAderum/master

Fix to #4