Added watt conversion factor.
Merged.