add isAdmin
Merge origin/master