Merge pull request #1 from unimi-ctu/master

Merge pull request #42 from forobliot/master
Merge pull request #44 from forobliot/master

Merge pull request #1 from unimi-ctu/master