Issue #101: Windows Build Improvements