Ariel

Merge - Brancha Ariel a Master.