FIX: Better windowing
Merge pull request #187 from Eric89GXL/fix-ex

FIX: Better windowing