moved search
Merge pull request #27 from mattinm/master

moved search