Fix #294
Merge pull request #304 from antgonza/issue_294

Fix #294