Issue #110 Revised regex as per code review comments