windows fixes
Merge pull request #172 from da2ce7/master

More Linker Error Fixes