Merge branch 'lua_ob2_working'