Merge master2 a augusto