fix, test and change
Merge branch 'master' of https://github.com/tuwiendsg/COMOT