merge jullianonascimento-master into pr43