Merge pull request #34 from DrMarcII/master

Fixes for window_test