Fixing scope bug on Windows
Merge branch 'master' into gh-pages