Support for regular expressions in criteria

Closes #12
Spacing