Merge pull request #29 from Negusbuk/master

various fixes and cleanups
Merge pull request #30 from Negusbuk/master

update of data streaming in thermo part