diff --git a/CMakeLists.txt b/CMakeLists.txt
index e081f1bc..b63c58fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,9 @@ if (BUILDDOC)
   find_package (Doxygen)
   if (DOXYGEN_FOUND)
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/docs/c++.png ${CMAKE_CURRENT_BINARY_DIR}/html/docs/c++.png COPYONLY)
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/docs/python.png ${CMAKE_CURRENT_BINARY_DIR}/html/docs/python.png COPYONLY)
+	configure_file (${CMAKE_CURRENT_SOURCE_DIR}/docs/node.png ${CMAKE_CURRENT_BINARY_DIR}/html/docs/node.png COPYONLY)
     add_custom_target (doc
       ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/README.md b/README.md
index 514c384c..76acd9fb 100644
--- a/README.md
+++ b/README.md
@@ -57,10 +57,16 @@ Make sure you add yourself as an author on every new code file submitted.
 If you are providing a fix with significant changes, feel free to add yourself
 as a contributor. Signing-off your commits is mandatory.
 
-C/C++ API Documentation
+API Documentation
 ==============
 
-The C/C++ documentation is available [here](http://iotdk.intel.com/docs/master/upm/).
+@htmlonly
+
+<a href="http://iotdk.intel.com/docs/master/upm/"><img src="docs/c++.png"/></a>
+<a href="http://iotdk.intel.com/docs/master/upm/python"><img src="docs/python.png"/></a>
+<a href="http://iotdk.intel.com/docs/master/upm/node"><img src="docs/node.png"/></a>
+
+@endhtmlonly
 
 Version @ref changelog [here](docs/changelog.md).
 
diff --git a/docs/c++.png b/docs/c++.png
new file mode 100644
index 00000000..b2beb322
Binary files /dev/null and b/docs/c++.png differ
diff --git a/docs/max31855.md b/docs/max31855.md
index 04706024..7405989e 100644
--- a/docs/max31855.md
+++ b/docs/max31855.md
@@ -80,7 +80,7 @@ useful to us and converting it to a double.
 
 Our final example, very easy to use API!
 
-@snippet examples/max31855.cxx Interesting
+@snippet examples/c++/max31855.cxx Interesting
 
 ### Building
 
diff --git a/docs/node.png b/docs/node.png
new file mode 100644
index 00000000..f0914681
Binary files /dev/null and b/docs/node.png differ
diff --git a/docs/python.png b/docs/python.png
new file mode 100644
index 00000000..3624457e
Binary files /dev/null and b/docs/python.png differ