bugfix with regular expressions
Merge pull request #451 from ffrensch/master

bugfix with regular expressions