Fix compiler warnings in VS2012.
Merge pull request #1 from Normmatt/Fix_warnings

Fix compiler warnings in VS2012.