Make this regex a little more liberal

To help with additional functionality