Now with .zip Master support as well