bug fixes[ci skip]
Merge branch 'master' of https://github.com/PetarV-/CSTIB-Echo