Fixed #222 by editing regex, commented in issue #222