Merge pull request #155 from andreazevedo/patch-1