Changed regexp again. Fixes problem with name starting at beginning of line