master: Adding the last changes made