Merge pull request #27 from apache/fix-regex-in-key

Fix regex patterns in keys