Merge pull request #1 from mi-tettamanti/master

cleanup