more work on search output
f
Merge pull request #70 from jpecht/master

more work on search output