Merge pull request #1 from Coolwave/master

needs search fix
text fix
Merge pull request #5 from HIGHWAY99/master

text fix