2nd pass at #69
Merge pull request #609 from johnjminer/patch-3

2nd pass at #69