Merge pull request #344 from dmaresma/patch-1