Fix #287
Addressing comments
Merge pull request #292 from antgonza/issue_287

Fix #287
addressing comments
fixing conflicts