Merge pull request #5 from hellopat/cfl

CFL + Code improvements
Merge branch 'master' into cfl