Updated code.
Merge branch '00-08-01' into 1036-implement-energy-resolution