Windowcleaner

Fixes #43 and #45