tweaked regexp and search
Merge branch 'master' of https://github.com/infmally/wb-fun
Merge branch 'master' of https://github.com/infmally/wb-fun