ENH: stricter regex thanks to Steven Hiscocks (kwirk)