Merge pull request #577 from blckmn/zcoref3