v1.3

Code refactoring