Revert "Revert "Merge pull request #1 from ZaLiTHkA/edge""

This reverts commit 436cd58d31694450ec2e15f1e1cf71ac06eaf920.