Add option for number of users per page (pagination)
Merge origin/master