Fixes #36
Merge pull request #176 from tiagobutzke/master

Fixing issue #36