fix bugs
Merge branch 'dev' of https://github.com/mehere/RTSS.git into dev
fix bugs