Some tweaks which should (hopefully) fix some issues on Windows system.
tweak..
minor change
Merge branch 'master' into release