Updating scripts from master