Fix windows
Merge branch 'elly-graphics'