Fixing issue #33
Merge pull request #34 from antgonza/fix_#33

Fixing issue #33