Updated to work with Zed.1.0.0.9