Would like to pull your regex checking commit.

Your regex checking is much cleaner.