Some search stuff
Merge branch 'master' of https://github.com/jvasallo/internMatch