Marco's changes
Merge pull request #3 from bettiolo/marco

Marco's changes