Merge pull request #10 from janLo/master

Some improvements at the admin side