added Energy
Merge pull request #14 from nickavv/master

added Energy