second attempt at avoiding warnings at /W4 on vs2013
Merge pull request #120 from sgraham/warnings-attempt-2

second attempt at avoiding warnings at /W4 on vs2013