Merge pull request #2 from rvianello/master

cleanup