diff --git a/website/Makefile b/website/Makefile
index 8fce7a7..369b58b 100755
--- a/website/Makefile
+++ b/website/Makefile
@@ -1,17 +1,13 @@
-all:
-	rm -rf public db.json
+all: clean
 	node install.js
-	rm -rf src/modern-cpp/book
 	python3 filter.py
-	rm -rf ./src/modern-cpp/assets/cover-2nd.png
-	rm -rf ./src/modern-cpp/assets/figures
 	cp ../assets/cover-2nd.png ./src/modern-cpp/assets/cover-2nd.png
 	cp -r ../assets/figures ./src/modern-cpp/assets/figures
 	cp -r ../exercises ./src/modern-cpp/book/
 	cp -r ../code ./src/modern-cpp/book/
 	hexo generate
 	mv public/index.html public/modern-cpp/index.html
-s:
+s: all
 	node_modules/serve/bin/serve.js ./public
 clean:
 	rm -rf ./src/modern-cpp/assets/cover-2nd.png
diff --git a/website/_config.yml b/website/_config.yml
index fdb4c05..2dbb5f5 100755
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -40,6 +40,8 @@ toc:
     position: after
     symbol: '#'
     style: header-anchor
+image_caption:
+  enable: true
 
 # Date / Time format
 ## Hexo uses Moment.js to parse and display date
diff --git a/website/package-lock.json b/website/package-lock.json
index 11a2a77..5dde581 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -1680,6 +1680,11 @@
         "sprintf-js": "^1.0.2"
       }
     },
+    "hexo-image-caption": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/hexo-image-caption/-/hexo-image-caption-0.1.1.tgz",
+      "integrity": "sha1-AJG1gtoFrO35RqPmfoqiBbH036I="
+    },
     "hexo-log": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/hexo-log/-/hexo-log-0.2.0.tgz",
diff --git a/website/package.json b/website/package.json
index 5969260..4b6e777 100755
--- a/website/package.json
+++ b/website/package.json
@@ -7,6 +7,7 @@
   },
   "dependencies": {
     "hexo-generator-index": "^0.2.1",
+    "hexo-image-caption": "^0.1.1",
     "hexo-renderer-ejs": "^0.3.1",
     "hexo-renderer-marked": "^0.3.2",
     "hexo-renderer-stylus": "^0.3.3"
diff --git a/website/themes/moderncpp/source/modern-cpp/css/page.styl b/website/themes/moderncpp/source/modern-cpp/css/page.styl
index 5d32a62..ed00eb6 100755
--- a/website/themes/moderncpp/source/modern-cpp/css/page.styl
+++ b/website/themes/moderncpp/source/modern-cpp/css/page.styl
@@ -14,6 +14,12 @@
   font-weight: bold;
   font-style: oblique;
 
+.image-caption
+  display: table;
+  margin: 0 auto;
+  color: #7f8c8d;
+  margin-top: 10px;
+
 .content
   position: relative
   padding: 2.2em 0