Fechando issues fixes #6, fixes #41, fixes #42, fixes #8