Extended REGEX to address issue #89