diff --git a/stb.h b/stb.h
index 446051622a6566c22da7ace1d2af83b0b1037543..d78c465390389e003b88137728925dd5d3b8473c 100644
--- a/stb.h
+++ b/stb.h
@@ -1400,12 +1400,18 @@ int stb_is_pow2(unsigned int n)
 #pragma warning(disable: 4035)  // disable warning about no return value
 int stb_log2_floor(unsigned int n)
 {
+   #if _MSC_VER > 1700
+   DWORD i;
+   _BitScanReverse(&i, n);
+   return i != 0 ? i : -1;
+   #else
    __asm {
       bsr eax,n
       jnz done
       mov eax,-1
    }
    done:;
+   #endif
 }
 #pragma warning(pop)
 #else
diff --git a/stb_image.h b/stb_image.h
index c3945c2e25d3ec40a7b9090a5e5e937055665ed9..d74ea1932716fe26b7ad7ab9ec4aafca48ee0fb5 100644
--- a/stb_image.h
+++ b/stb_image.h
@@ -6277,7 +6277,7 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
       1.21    fix use of 'stbi_uc' in header (reported by jon blow)
       1.20    added support for Softimage PIC, by Tom Seddon
       1.19    bug in interlaced PNG corruption check (found by ryg)
-      1.18 2008-08-02
+      1.18  (2008-08-02)
               fix a threading bug (local mutable static)
       1.17    support interlaced PNG
       1.16    major bugfix - stbi__convert_format converted one too many pixels
@@ -6322,5 +6322,6 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
       0.52    png handles req_comp=3,4 directly; minor cleanup; jpeg comments
       0.51    obey req_comp requests, 1-component jpegs return as 1-component,
               on 'test' only check type, not whether we support this variant
-      0.50    first released version
+      0.50  (2006-11-19)
+              first released version
 */