Manually merge #52 (VS 2014 warnings). Credits to CFusion.