Squashed commit of the following:

commit 676f74aafb6f9db2f88f78bc8fcf2db3b21c0677
Author: marscher <m.scherer@fu-berlin.de>
Date:   Wed Sep 24 18:38:01 2014 +0200

    fix