first pass #75
Merge pull request #886 from gruiz17/patch-4

first pass #75