Deploy and Admin Updates

Merging with pull request #148