Merge pull request #549 from PetteriAimonen/edge