Merge pull request #686 from thinkl33t/edge