Fixed #574
Fixed #558
commit
Merge branch 'master' of github.com:asksven/BetterBatteryStats