fix bugs
fix bugs
fix CIT Issues
Fix CIT issues
Merge branch 'master' of https://github.com/EdgeComputing/cats