Issue #216
Merge pull request #217 from ralph-moeritz/master

Issue #216