Squashed commit of the following:

commit c5d70f3ddcefc2be6e5ce4112412e8d1c1dc87c1
Author: Nicolai Czempin <contact@czempin.de>
Date:   Sat Apr 19 16:06:15 2014 +0200

    some movement