Some updates for regex use. #29
Simpler regex for now.  #29