Some fixes on Framework because MS doesn't like the code...
Merge branch 'master' of github.com:Arctium/Arctium