Merge pull request #164 from cesaralves/patch-2