Get rid of all warnings and errors on Windows.
Merge branch 'master' into windoze
Merge pull request #149 from kkoopa/windoze

Get rid of all warnings and errors on Windows.