Added wildcard to regex conversion. Resolves #24