Add sorting to user list

#41
Merge remote-tracking branch 'upstream/master'