refactoring CL
refactoring CL
Merge pull request #3 from radi-v/master

Mergin refactoring by radi-v.