Minor code review integration
Merge remote-tracking branch 'origin/master' into initial-version-of-pagination