Merge my work before
Merge branch 'master' of https://github.com/kzjnet/search

Conflicts:
	include/search.hpp