Fixes changes cleanup
Merge branch 'master' of github.com:tm1000/framework