fixed searching bugs
Merge pull request #17 from xsimov/bugfixing

Bugfixing