Add make-window, with-window
Increment version