Merge pull request #199 from wolfmanjm/upstreamedge