note on Windows installation
Merge branch 'master' into capabilities