Merge pull request #86 from bgamari/edge