Issue214 1.2

Not sure whether it makes sense to create "follow-up" pull requests before the previous one(s) have been merged. Let's see. As you can see, locally I have merged back onto master before creating the next branch.