Tag/Token regexp for recipient factory
Merge pull request #5 from MikaFima/fix/factory-regexp

Alias/Token regexp for recipient factory