Fixed #625
Fixed #618
Fixed #616
Merge branch 'master' of github.com:asksven/BetterBatteryStats
Added tests