Fixed all msvc10 warnings
Merge pull request #155 from rdnelson/msvc10_warning_fix

Fixed all msvc10 warnings