Add a few more types for Windows
Merge pull request #340 from HeisSpiter/master

Add a few more types for Windows