Made some small changes that caused some issues in the cores of the framework.
Merge branch 'master' of github.com:TDT/Framework