Merge pull request #11 from TravisEvashkevich/master

Tweak and Search Fix