merge geovane1992-master into pr56