Merge pull request #738 from RTimothyEdwards/fix/zgrid-cartesian