updated some regex
Merge branch 'master' of https://github.com/allevaton/lana