Changed working for "no power"
Merge remote-tracking branch 'origin/master'