Made regex a little more forgiving