modifico dev 1.3
Merge branch 'dev'