diff --git a/README.md b/README.md
index a9047fb..b86f66b 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ or copy at http://opensource.org/licenses/MIT)
 - to be well documented, in code with Doxygen, and online with some good examples
 - to be portable
 - to be light and fast
-- to be monothreaded
+- to be monothreaded (not thread-safe)
 - to use API names sticking with those of the SQLite library
 - to be well maintained
 
diff --git a/TODO.txt b/TODO.txt
index 177e67f..1a3c70d 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,3 @@
-Add a comparison of others C++ wrappers (code style, C++ design, in code documentation, tests, online documentation, examples, license, UTF-16) 
-
 C++11 explicit support
 
 Adding an encapsulation to the statement ref counter
@@ -12,6 +10,7 @@ Missing features in v0.4.0:
 
 Missing documentation in v0.4.0:
 - Help for the new helper functions
+- This wrapper is not thread safe : compare to the thread safety of the SQLite3 library
 
 Advanced missing features:
 - :memory: : use the "zVfs" (last) parameter of sqlite3_open_v2() to give access to the ":memory:" VFS module
@@ -27,6 +26,8 @@ Add a full test suite
 
 Add optional usage of experimental sqlite3_trace() function to enable statistics 
 
+Add a comparison of others C++ wrappers (code style, C++ design, in code documentation, tests, online documentation, examples, license, UTF-16) 
+
 Post an article to CodeProject : Is there a license issue ?
 Mirror the repository to GoogleCode : with a versionned downloadable ZIP file
 
diff --git a/src/SQLiteC++/Column.h b/src/SQLiteC++/Column.h
index d8017bc..c4c9897 100644
--- a/src/SQLiteC++/Column.h
+++ b/src/SQLiteC++/Column.h
@@ -20,8 +20,6 @@ namespace SQLite
  * @brief Encapsulation of a Column in a Row of the result.
  *
  * A Column is a particular field of SQLite data in the current row of result of the Statement.
- *
- * @todo mpStmtRefCount is thread unsafe !
  */
 class Column
 {
diff --git a/src/SQLiteC++/Statement.h b/src/SQLiteC++/Statement.h
index 2311f14..7d71b66 100644
--- a/src/SQLiteC++/Statement.h
+++ b/src/SQLiteC++/Statement.h
@@ -28,8 +28,6 @@ class Column;
  * Resource Acquisition Is Initialization (RAII) means that the Statement
  * is compiled in the constructor and finalized in the destructor, so that there is
  * no need to worry about memory management or the validity of the underlying SQLite Statement.
- *
- * @todo mpStmtRefCount is thread unsafe !
  */
 class Statement
 {