Add search support
Merge pull request #9 from widop/f-search

Add search support