Merge pull request #701 from ReyAleman/master

some script fixes