More admin related things
Merge pull request #14 from jtorraca/master

More admin related things