Merge pull request #756 from pragupta/witherspoon_xml_mk_update

Updates to generate witherspoon pnor successfully