search function complete
Merge branch 'refs/heads/laura'