Fixed issue #3 - regular expression now checks entire string