stuff
Merge pull request #1 from ettore90/master

stuff2