add map-regexp
Merge pull request #769 from tarsius/map-regexp

add map-regexp