typo
improved regexs
Merge branch 'master' into without-signature-feature