Merge branch 'energy' of https://github.com/sebhtml/biosal
Merge branch 'energy' of https://github.com/sebhtml/biosal