2D fix
Merge branch 'Erik' into Windows