removed unnecessary comments
Merge branch 'master' into andrea_branch
Merge branch 'andrea_branch'