Merge pull request #96 from wolfmanjm/upstreamedge