Windows build fixes
Merge pull request #3 from bryceweiner/master

Windows build fixes