admin setup various
Merge pull request #5 from dglunz/admin

admin setup various