merge (again) from raphaelpereira to viniciuscb