modifico dev 1.1
Merge branch 'dev'