Change to search function instead
Merge pull request #331 from dreamteam69/master

Change to search function instead