aula32 -  Closes #12
aula32 -  Closes #4