Issue214 6.7

Smaller pull requests as discussed.