fix #253
Merge pull request #299 from antgonza/fix_253

fix #253