diff --git a/doc/faq.md b/doc/faq.md
index 9ce9ae24..753e34a0 100644
--- a/doc/faq.md
+++ b/doc/faq.md
@@ -1,5 +1,7 @@
 # FAQ
 
+[TOC]
+
 ## General
 
 1. What is RapidJSON?
@@ -214,7 +216,7 @@
 
 1. Who are the developers of RapidJSON?
 
-   Milo Yip (@miloyip) is the original author of RapidJSON. Many contributors from the world have improved RapidJSON.  Philipp A. Hartmann (@pah) has implemented a lot of improvements, setting up automatic testing and also involves in a lot of discussions for the community. Don Ding (@thebusytypist) implemented the iterative parser. Andrii Senkovych (@jollyroger) completed the CMake migration. Kosta (@Kosta-Github) provided a very neat short-string optimization. Thank you for all other contributors and community members as well.
+   Milo Yip ([@miloyip](https://github.com/miloyip)) is the original author of RapidJSON. Many contributors from the world have improved RapidJSON.  Philipp A. Hartmann ([@pah](https://github.com/pah)) has implemented a lot of improvements, setting up automatic testing and also involves in a lot of discussions for the community. Don Ding ([@thebusytypist](https://github.com/thebusytypist)) implemented the iterative parser. Andrii Senkovych ([@jollyroger](https://github.com/jollyroger)) completed the CMake migration. Kosta ([@Kosta-Github](https://github.com/Kosta-Github)) provided a very neat short-string optimization. Thank you for all other contributors and community members as well.
 
 2. Why do you develop RapidJSON?
 
diff --git a/doc/faq.zh-cn.md b/doc/faq.zh-cn.md
index 54a04236..26bbee7d 100644
--- a/doc/faq.zh-cn.md
+++ b/doc/faq.zh-cn.md
@@ -1,5 +1,7 @@
 # 常见问题
 
+[TOC]
+
 ## 一般问题
 
 1. RapidJSON是什么？
@@ -214,7 +216,7 @@
 
 1. 谁是RapidJSON的开发者？
 
-   叶劲峰（Milo Yip，@miloyip）是RapidJSON的原作者。全世界许多贡献者一直在改善RapidJSON。Philipp A. Hartmann（@pah）实现了许多改进，也设置了自动化测试，而且还参与许多社区讨论。丁欧南（Don Ding，@thebusytypist）实现了迭代式解析器。Andrii Senkovych（@jollyroger）完成了向CMake的迁移。Kosta（@Kosta-Github）提供了一个非常灵巧的短字符串优化。也需要感谢其他献者及社区成员。
+   叶劲峰（Milo Yip，[@miloyip](https://github.com/miloyip)）是RapidJSON的原作者。全世界许多贡献者一直在改善RapidJSON。Philipp A. Hartmann（[@pah](https://github.com/pah)）实现了许多改进，也设置了自动化测试，而且还参与许多社区讨论。丁欧南（Don Ding，[@thebusytypist](https://github.com/thebusytypist)）实现了迭代式解析器。Andrii Senkovych（[@jollyroger](https://github.com/jollyroger)）完成了向CMake的迁移。Kosta（[@Kosta-Github](https://github.com/Kosta-Github)）提供了一个非常灵巧的短字符串优化。也需要感谢其他献者及社区成员。
 
 2. 为何你要开发RapidJSON？