Merge pull request #347 from gogolander/test

pulizia et al.
Merge pull request #348 from gogolander/test

more without less
new stuff