[Teste][Issue #4][Issue #12] Testing fix to issue #4 and issue #13. Solved.