removed vs2013 warnings

Rebased over latest dev