Merge pull request #139 from logxen/edge