Non-greedy quantifier fixes #63