Make cleanup, added windows (thanks to hy)