Updated script location.
Resolved merge conflicts.
Wrote to file instead of running file.
Merge branch 'master' into develop