Battery status fix
Merge remote-tracking branch 'kelpine/master'