Fix Masurca bug
Merge branch 'edge'