Experimental, goes to src. And updated UML
Merge pull request #17 from cravacuore/develop

Experimental, goes to src