removed stupid ; at the end of the if-statement
Merge branch 'fixPower', remote-tracking branch 'origin'