Merge pull request #64 from sgraham/fix-win32-warnings

Fix a couple warnings when building on win32