Made the last changes before merging to master