diff --git a/HISTORY b/HISTORY
index e8a113b..200d5c1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,7 @@
 
+Version 1.21  2015-08-25
+  * ini_file_reader support annotation function
+
 Version 1.20  2015-08-06
   * add GEO function get_line_distance_km
 
diff --git a/libfastcommon.spec b/libfastcommon.spec
index 6de3d78..d623a64 100644
--- a/libfastcommon.spec
+++ b/libfastcommon.spec
@@ -2,7 +2,7 @@
 %define LibFastcommonDevel  libfastcommon-devel
 
 Name: libfastcommon
-Version: 1.0.20
+Version: 1.0.21
 Release: 1%{?dist}
 Summary: c common functions library extracted from my open source projects FastDFS
 License: GPL
diff --git a/src/ini_file_reader.c b/src/ini_file_reader.c
index 9eaeeea..b3cb2cb 100644
--- a/src/ini_file_reader.c
+++ b/src/ini_file_reader.c
@@ -323,6 +323,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
 	result = 0;
     pAnnoItemLine = NULL;
     isAnnotation = 0;
+    *pFuncName = '\0';
 	pLastEnd = content - 1;
 	pSection = pContext->current_section;
     pItem = pSection->items + pSection->count;
@@ -339,8 +340,8 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
         if (isAnnotation && pLine != pAnnoItemLine)
         {
             logWarning("file: "__FILE__", line: %d, " \
-                "the @function and annotation item " \
-                "must be next to each other", __LINE__);
+                "the @function annotation line " \
+                "must follow by key=value line!", __LINE__);
             isAnnotation = 0;
         }
 
@@ -417,8 +418,17 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
             memcpy(pFuncName, pLine + 11, nNameLen);
             pFuncName[nNameLen] = '\0';
             trim(pFuncName);
-            isAnnotation = 1;
-            pAnnoItemLine = pLastEnd + 1;
+            if ((int)strlen(pFuncName) > 0)
+            {
+                isAnnotation = 1;
+                pAnnoItemLine = pLastEnd + 1;
+            }
+            else
+            {
+                logWarning("file: "__FILE__", line: %d, " \
+                        "the function name of annotation line is empty", \
+                        __LINE__);
+            }
             continue;
         }
 
@@ -541,7 +551,7 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
             pAnnoMap = g_annotataionMap;
             while (pAnnoMap->func_name)
             {
-                if (strcasecmp(pFuncName, pAnnoMap->func_name) == 0)
+                if (strcmp(pFuncName, pAnnoMap->func_name) == 0)
                 {
                     if (pAnnoMap->func_init)
                     {
@@ -560,9 +570,9 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
             if (nItemCnt == -1)
             {
                 logWarning("file: "__FILE__", line: %d, " \
-                    "not found corresponding annotation func (%s)" \
-                    " and (%s) will use the item value (%s).", __LINE__,
-                    pItem->name, pFuncName, pItem->value);
+                    "not found corresponding annotation function: %s, " \
+                    "\"%s\" will use the item value \"%s\"", __LINE__,
+                    pFuncName, pItem->name, pItem->value);
                 pSection->count++;
                 pItem++;
                 continue;
@@ -570,16 +580,16 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
             else if (nItemCnt == 0)
             {
                 logWarning("file: "__FILE__", line: %d, " \
-                    "annotation func(%s) execute failed and"
-                    "(%s) will use the item value (%s)", __LINE__,
-                    pItem->name, pFuncName, pItem->value);
+                    "annotation function %s execute fail, " \
+                    "\"%s\" will use the item value \"%s\"", __LINE__,
+                    pFuncName, pItem->name, pItem->value);
                 pSection->count++;
                 pItem++;
                 continue;
             }
 
             pItemName = pItem->name;
-            nNameLen = strlen(pItemName) + 1;
+            nNameLen = strlen(pItemName);
             for (i = 0; i < nItemCnt; i++)
             {
                 nValueLen = strlen(pItemValues[i]);
@@ -603,15 +613,16 @@ static int iniDoLoadItemsFromBuffer(char *content, IniContext *pContext)
             }
             continue;
         }
+
 		pSection->count++;
 		pItem++;
 	}
 
-    if (!result && isAnnotation)
+    if (result == 0 && isAnnotation)
     {
         logWarning("file: "__FILE__", line: %d, " \
-            "the @function and annotation item " \
-            "must be next to each other", __LINE__);
+            "the @function annotation line " \
+            "must follow by key=value line!", __LINE__);
     }
 
 	return result;