Fix regex to be more comprehensive.  Update Readme.