Removed useless TODO.
Removed useless TODO and minor cleanups. Related to issue #62.
Use proper units for temperature
Merge remote-tracking branch 'upstream/master'