Refactoring.
Refactoring
Merge branch 'master' of https://github.com/ffalchi/it.cnr.isti.vir.git