Merge pull request #1043 from quickwritereader/z13