3rd pass at #69
Merge pull request #610 from johnjminer/patch-4

3rd pass at #69