done with feature: fix-issue-28

Hello Raul,

I fixed issue 28 with the @leandroleo002.

Please, merge it?

Tks!