Merge pull request #71 from bgamari/edge