Improve, test and fix GeneralSearch branch. Pull: #1
Improve, test and fix GeneralSearch branch.
Pull: #1