Merge pull request #2 from snoweye/master

windows updates
Merge pull request #1 from wrathematics/master

Merge pull request #2 from snoweye/master