Energy units reverted
Merge pull request #31 from Adaptivity/patch-1

Energy units reverted