Silvio

Merged code and code documentation