fix
fixes
Merge remote-tracking branch 'origin/huiyang'
fixes
linear search