Search engine upgrade
Merge branch 'master'
Merge branch 'master' of https://github.com/hub387/bardo.git