Merge pull request #3 from JeppeTh/master

Fixed searching and bundled categories
Merge pull request #11 from meriko/master

Fixed searching and bundled categories