Bugfix Search
Merge pull request #51 from ivonu/master

Bugfix Search
merge master