Fixed admin support
Merge pull request #340 from lDiverse/master

Fixed admin support