Fixes and support for Windows
mergepdtest
merge again
Merge branch 'giantSteps' into pdtest