Add keyword search function
Merge remote-tracking branch 'origin/master'