fixing script
merged master