First pass #74
Merge pull request #882 from gruiz17/patch-2

First pass #74