energy from johannes
Merge branch 'master' of https://github.com/sebllll/ccl