Peer, escenario 3 done
Merge origin/master