Added strict check and window load
Merge branch 'release/1.1.0'