slightly formatted, plus working search
Merge pull request #2 from margo73465/dev

slightly formatted, plus working search