search refact
Merge branches 'dev' and 'dev' of github.com:realjade/shanlan-node into dev