Address comments from pull request #11, verifying windows build.