Scripting v1.0
merge fix