Adding Search pagination ('more' style)
Merge remote-tracking branch 'origin/master'