Temp commit for merge
Merge branch 'master' of https://github.com/Remaged/Scadsy
Fixed a lot of bugs