Merge pull request #163 from cesaralves/patch-1