Merge pull request #87 from bgamari/edge