Merge pull request #17 from psparabara/develop

improve searching functionality