Energy Circle added
Merge branch 'master' of https://github.com/apautrot/gdp7