CL-12 Implement design
Merge pull request #16 from jacekelgda/CL_12

CL-12 Implement design