Merge branches 'version3' and 'new' into version3
add search positions
Merge branches 'version3' and 'test' into version3