Merge admin
Merge pull request #2 from pennmanor/simple

Merge simple