Fixing Admins end
Merge pull request #216 from phiamo/fix-admin-1.1

Fixing Admins end
Merge remote-tracking branch 'origin/1.1'