Update regex 041614

this is branched from my earlier PRs, so please merge them first.