new updates for pagination
Merge remote-tracking branch 'origin/master'