Zombie-PR of 369

This are the leftovers of #369 - as GitHub is no longer interested in tracking the `issues/355` branch. :)
Let's wait for @travis-ci and hope everything will be alright. :)