Improved EdgeCast detection

Issue #300