Merge #105 to start followup work on Windows build