Merge pull request #34 from mjvermeltfoort/hotfix/preserve-by-regex

Hotfix/preserve by regex
Merge remote branch 'upstream/develop' into develop