Windows & Version fixes
Merge pull request #2 from obviousjim/master

Windows & Version fixes