First pass at #79
Merge pull request #729 from pjfamig/patch-4

First pass at #79