Snedashkovsky Merge pull request #52 from Snedashkovsky/fix_search