diff --git a/AUTHORS b/AUTHORS
index 6106cbba..5606a9fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,6 +41,7 @@ Piotr Trojanek <piotr.trojanek@gmail.com>
 Sebastian Otaegui <feniix@gmail.com>
 Steven McCoy <steven.mccoy@miru.hk>
 Tamara Kustarova <kustarova.tamara@gmail.com>
+Taras Shpot <taras.shpot@eleks.com>
 Tero Marttila <terom@fixme.fi>
 Terry Wilson <terry@logivox.net>
 Vitaly Mayatskikh <v.mayatskih@gmail.com>
diff --git a/src/uuid.cpp b/src/uuid.cpp
index f1dddf09..a119be0d 100644
--- a/src/uuid.cpp
+++ b/src/uuid.cpp
@@ -41,6 +41,8 @@ zmq::uuid_t::uuid_t ()
 
 zmq::uuid_t::~uuid_t ()
 {
+    if (string_buf)
+        RpcStringFree (&string_buf);
 }
 
 const char *zmq::uuid_t::to_string ()
diff --git a/src/uuid.hpp b/src/uuid.hpp
index 871f8272..a528baf5 100644
--- a/src/uuid.hpp
+++ b/src/uuid.hpp
@@ -58,7 +58,7 @@ namespace zmq
         enum { uuid_string_len = 36 };
 
         //  Returns a pointer to buffer containing the textual
-        //  representation of the UUID. The caller is reponsible to
+        //  representation of the UUID. The callee is reponsible to
         //  free the allocated memory.
         const char *to_string ();