diff --git a/TODO.txt b/TODO.txt
index 1505dd28..2de8add5 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -29,3 +29,4 @@
 * Fix method, use string instead of enum
 * More fine grained parser errors
 * Fix all the warnings in all projects/build configs
+* Fix bidirectional buffers iterators operator->()
diff --git a/include/beast/version.hpp b/include/beast/version.hpp
new file mode 100644
index 00000000..76039b1c
--- /dev/null
+++ b/include/beast/version.hpp
@@ -0,0 +1,21 @@
+//
+// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef BEAST_VERSION_HPP
+#define BEAST_VERSION_HPP
+
+// follows http://semver.org
+
+//  BEAST_VERSION % 100 is the patch level
+//  BEAST_VERSION / 100 % 1000 is the minor version
+//  BEAST_VERSION / 100000 is the major version
+//
+#define BEAST_VERSION 100000
+
+#define BEAST_VERSION_STRING "1.0.0-b2"
+
+#endif