adding some more handling of data from software
adding some more handling of data from software
Merge branch 'master' of https://github.com/Dowers/tsea29
potential bugg fix