final changes
Merge branch 'master' of github.com:andrea-bottoli/DSD