Fix #302
addressing local comments
Merge pull request #305 from antgonza/issue_302

Fix #302