New attempt at #212
Merge pull request #1155 from pjfamig/patch-7

New attempt at #212