Now with non-quick and clean code :P

Merge remote-tracking branch 'origin/master' into Benni (reverted from commit c81a04dabe9dbec2f311100898175b0bae3348de)