need to merge edric's CLCS slow
Merge branch 'master' of github.com:akhor93/CLCS
Merge branch 'master' of github.com:akhor93/CLCS