Update for user searching 4 YUKARi
Merge remote-tracking branch 'origin/master'