fix issue 53
resolvido conflitos do merge