Simplify class search
Merge pull request #7 from raphink/dev/class_search_hash

Simplify class search