Merge changes from evertoncustodio