Merge branch 'fixo/1.0'