Merge branch 'master' into jeffs_branch
Updated to reflect correct search functionality
Merge branch 'jeffs_branch'