Commit 0.2 Cristian Branch