Pass at #69
Merge pull request #606 from johnjminer/patch-2

Pass at #69