Updated Framework and Modules

Updated to framework version 1.0.1.2 (Beta 2).