Avoid unnecessary hashtable search
Merge pull request #15 from zaki50/avoid_unnecessary_hashtable_search

Avoid unnecessary hashtable search