First pass at #212
Merge pull request #649 from pjfamig/patch-1

First pass at #212