improve fake regexp
fix fake regexp, bump version
use named regexp
Merge pull request #23 from stdweird/postupgradefixes

Postupgradefixes