Use a more concise REGEX to prevent unwanted match. Closes #38.