Use window instead of this
Minor refactor
Merge branch 'release/0.3.2' into develop