fixes #266 : energy in kWh not J
Merge pull request #62 from cassandra-project/develop

get updates
Merge pull request #277 from fgiannar/develop

energy in KWh not J