Several framework fixes
Merge branch 'master' of github.com:Nekith/strayFw