Add zip_safe flag
Merge branch 'master' into dev