Preliminary work
Merge remote-tracking branch 'origin/master' into Hon-Wei
Things work kinda...Tofix:getWindowX|Y
...