debug keyword search
upstream merge
Merge pull request #75 from incrediblesound/master

debug keywordsearch