fix
Merge branch 'master' of github.com:Wadum/sCT
smA fixes