Simplified the regexp used in the last article