fixed missing variable instantiation
changed window tidy
Merge branch 'master' of github.com:mupat/dev