Merge pull request #4 from twomice/search

Search