First pass at #80
Merge pull request #862 from gruiz17/patch-1

First pass at #80