Merge pull request #292 from wolfmanjm/upstreamedge

Upstreamedge