Merge pull request #15 from meriko/master

Fix Search functionality