First pass at #299, Rick Larson
Merge pull request #700 from ryan-ludwig/patch-1

First pass at #299, Rick Larson