pulling changes from master

changed regex