Resolve "aging of battery in more detail"

Merged Johannes requested to merge 5-aging-of-battery-in-more-detail into master