#110 Search By Keyword Bug
Merge remote-tracking branch 'origin/master'