Merge rotation branch

This code from that branch is not used directly. Instead, its
functionality was reimplemented in a clean way in the previous commits
of the master branch.

This merge is just to close the pull request and to not loos the
original implementation if it is needed sometimes later.