Merge pull request #381 from EvertonMelo/patch-3