Improved the speed of the entry search
- Various other improvements/changes
Merge pull request #8 from Mitch528/master

Improved the speed of the entry search