improve search
merge master