Merge pull request #70 from rbarbera/master

SearchBar bug fixed
dirty and fast optimization :P