added x,y,width,height to window
Merge remote-tracking branch 'origin/master'