updated regular expressions
Merge branch 'master' of https://github.com/mroll/leiser