One more fix in the regexp for issue #155: alowing dots and dashes as well