Merge pull request #1 from arjenk/master

some improvements
Merge remote-tracking branch 'github/master' into upstream/master
Merge branch 'master' into upstream/master
Allowed adminstrators to normal login.