Merge pull request #40 from kelvinlee93/master

Fix
Fix search
Merge pull request #7 from mrcupid12/master

AAA