Issue #302
- removed the regexp as suggested by @zpao
- changed + added tests for new behaviour and discussion