Copyedits
Greedy, greedy little regex.. fix #38