Fix bug 22
Merge pull request #4 from andrefgomes/fix22

Accept merge that fixes issue #22