staging for the evening
Merge branch 'master' into add_search
Merge pull request #7 from bemyhre/add_search

Add search