Merge pull request #23 from cavedude00/master

merge from cavedude00:master
moved window specific header file to #ifdef _WINDOWS
Merge pull request #267 from regneq/master

merge from regneq:master