v1.3

Refactoring, eliminate dipendenze