Merge remote-tracking branch 'patrick/master'
fix windowlevel bug
Merge remote-tracking branch 'dean/master'