Issue214 7

As before - let me rebase before you merge.