´typo fixed
Merge branch 'edge'