First commit (flavio)!
Merge flavioarau branch
Merge flavioarau branch