fix candidate for #184
Merge pull request #195 from vmarrazzo/master

Close #184