Code quality tasks
Merge pull request #9 from fontanalorenzo/master

Code quality tasks