Merge pull request #18 from verbunden/usermgr

User Manager