Fixing some warnings
Merge pull request #1 from aawc/master

Just fixing some warnings that VS 2012 generated.