Merge pull request #754 from BrianGilbert/edge