Merge pull request #44 from luciano-fiandesio/issue-25