Updated script for .zip master support