Merge pull request #140 from richg/0.9.x-win

Minor changes for windows compatibility