Fix for terraformer 1.0.4, add support for Z and M