Better regexp
Merge branch 'master' of https://github.com/gbbr/jamon