Refactored CLS package
Merge branch 'master' of https://github.com/liam-m/PlanePeril