Minor modifications for including the framework. Also added version controll.