Cristian Branch 3.0
Commit 3.1