Merge branch 'frast-issue207' (#208, fixes #207)