--Set battery to return 100 always.

--Corrected model machine null checking
Merge remote-tracking branch 'origin/master'