Commit 0.1 branch Cristian