Prevented user data leak
Merge branch 'master' of robinson.informatik.uni-bremen.de:awe04