Improved regex matching
Merge branch 'master' of https://github.com/fedragon/jess