merge branchs (guilherme -> master)