fixed bug with watts/calories
Merge remote-tracking branch 'origin/master'