Merge pull request #26 from TyounanMOTI/fix_std_max_vs2013