merged latest from Vanderson 

@vandersonmota : Thanks!