diff --git a/algorithms/README.md b/algorithms/README.md
index 00e0646f47..f1e12ee243 100644
--- a/algorithms/README.md
+++ b/algorithms/README.md
@@ -5,3 +5,4 @@
- [Ant Colony Optimization](http://www.baeldung.com/java-ant-colony-optimization)
- [Validating Input With Finite Automata in Java](http://www.baeldung.com/finite-automata-java)
- [Introduction to Jenetics Library](http://www.baeldung.com/jenetics)
+- [Check If a Number Is Prime in Java](http://www.baeldung.com/java-prime-numbers)
diff --git a/core-java-9/README.md b/core-java-9/README.md
index a6cda8e883..3e82ffe14b 100644
--- a/core-java-9/README.md
+++ b/core-java-9/README.md
@@ -12,3 +12,4 @@
- [Spring Security – Redirect to the Previous URL After Login](http://www.baeldung.com/spring-security-redirect-login)
- [Java 9 Process API Improvements](http://www.baeldung.com/java-9-process-api)
- [Introduction to Java 9 StackWalking API](http://www.baeldung.com/java-9-stackwalking-api)
+- [Introduction to Project Jigsaw](http://www.baeldung.com/project-jigsaw-java-modularity)
diff --git a/core-java/README.md b/core-java/README.md
index 45695f13f6..910e0fbbec 100644
--- a/core-java/README.md
+++ b/core-java/README.md
@@ -92,3 +92,9 @@
- [Removing all nulls from a List in Java](http://www.baeldung.com/java-remove-nulls-from-list)
- [Removing all duplicates from a List in Java](http://www.baeldung.com/java-remove-duplicates-from-list)
- [An Introduction to ThreadLocal in Java](http://www.baeldung.com/java-threadlocal)
+- [Using Math.pow in Java](http://www.baeldung.com/java-math-pow)
+- [Converting Strings to Enums in Java](http://www.baeldung.com/java-string-to-enum)
+- [Flattening Nested Collections in Java](http://www.baeldung.com/java-flatten-nested-collections)
+- [Quick Guide to the Java StringTokenizer](http://www.baeldung.com/java-stringtokenizer)
+- [JVM Log Forging](http://www.baeldung.com/jvm-log-forging)
+- [Guide to sun.misc.Unsafe](http://www.baeldung.com/java-unsafe)
diff --git a/cucumber/README.md b/cucumber/README.md
new file mode 100644
index 0000000000..5466d5c561
--- /dev/null
+++ b/cucumber/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Cucumber and Scenario Outline](http://www.baeldung.com/cucumber-scenario-outline)
diff --git a/groovy-spock/README.md b/groovy-spock/README.md
new file mode 100644
index 0000000000..18d26e8fc0
--- /dev/null
+++ b/groovy-spock/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Introduction to Testing with Spock and Groovy](http://www.baeldung.com/groovy-spock)
diff --git a/guava21/README.md b/guava21/README.md
index ff12555376..8725352d69 100644
--- a/guava21/README.md
+++ b/guava21/README.md
@@ -1 +1,2 @@
-## Relevant articles:
+### Relevant articles:
+- [New Stream, Comparator and Collector Functionality in Guava 21](http://www.baeldung.com/guava-21-new)
diff --git a/jackson/README.md b/jackson/README.md
index 5bc16e66b7..51919f6769 100644
--- a/jackson/README.md
+++ b/jackson/README.md
@@ -27,3 +27,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Guide to @JsonFormat in Jackson](http://www.baeldung.com/jackson-jsonformat)
- [A Guide to Optional with Jackson](http://www.baeldung.com/jackson-optional)
- [Map Serialization and Deserialization with Jackson](http://www.baeldung.com/jackson-map)
+- [Jackson Streaming API](http://www.baeldung.com/jackson-streaming-api)
diff --git a/javaslang/README.md b/javaslang/README.md
index e451883516..fe413fc275 100644
--- a/javaslang/README.md
+++ b/javaslang/README.md
@@ -2,3 +2,4 @@
- [Introduction to Javaslang](http://www.baeldung.com/javaslang)
- [Guide to Try in Javaslang](http://www.baeldung.com/javaslang-try)
- [Guide to Pattern Matching in Javaslang](http://www.baeldung.com/javaslang-pattern-matching)
+- [Property Testing Example With Javaslang](http://www.baeldung.com/javaslang-property-testing)
diff --git a/jee7/README.md b/jee7/README.md
index bc242c3340..8381bcbf34 100644
--- a/jee7/README.md
+++ b/jee7/README.md
@@ -1,3 +1,4 @@
### Relevant Articles:
- [Scheduling in Java EE](http://www.baeldung.com/scheduling-in-java-enterprise-edition)
- [JSON Processing in Java EE 7](http://www.baeldung.com/jee7-json)
+- [Converters, Listeners and Validators in Java EE 7](http://www.baeldung.com/java-ee7-converter-listener-validator)
diff --git a/jhipster/README.md b/jhipster/README.md
index d45796d867..d321e9e81e 100644
--- a/jhipster/README.md
+++ b/jhipster/README.md
@@ -1,3 +1,8 @@
+### Relevant articles
+
+- [Intro to JHipster](http://www.baeldung.com/jhipster)
+
+
# baeldung
This application was generated using JHipster 4.0.8, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.0.8](https://jhipster.github.io/documentation-archive/v4.0.8).
diff --git a/jws/README.md b/jws/README.md
new file mode 100644
index 0000000000..428d8b650d
--- /dev/null
+++ b/jws/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [A Guide to the Java Web Start](http://www.baeldung.com/java-web-start)
diff --git a/lagom/README b/lagom/README.md
similarity index 92%
rename from lagom/README
rename to lagom/README.md
index 0d81a4b3c1..909fe0dff4 100644
--- a/lagom/README
+++ b/lagom/README.md
@@ -1,3 +1,10 @@
+### Relevant articles
+
+- [Guide to Reactive Microservices Using Lagom Framework](http://www.baeldung.com/lagom-reactive-microservices)
+
+
+
+
Steps to setup from scratch
1) Create sbt build file "build.sbt"
diff --git a/libraries/README.md b/libraries/README.md
index 8a32a8b0e7..1cfa7be86c 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -7,6 +7,8 @@
- [Introduction to Javassist](http://www.baeldung.com/javassist)
- [Embedded Jetty Server in Java](http://www.baeldung.com/jetty-embedded)
- [Introduction to Apache Flink with Java](http://www.baeldung.com/apache-flink)
+- [Introduction to JSONassert](http://www.baeldung.com/jsonassert)
+- [Intro to JaVer](http://www.baeldung.com/javers)
The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
diff --git a/ratpack/README.md b/ratpack/README.md
index af473ef0e8..91c8e025f0 100644
--- a/ratpack/README.md
+++ b/ratpack/README.md
@@ -1,3 +1,4 @@
### Relevant articles
- [Introduction to Ratpack](http://www.baeldung.com/ratpack)
+- [Ratpack Google Guice Integration](http://www.baeldung.com/ratpack-google-guice)
diff --git a/rest-testing/README.md b/rest-testing/README.md
index 5dd4e49162..37a53dd815 100644
--- a/rest-testing/README.md
+++ b/rest-testing/README.md
@@ -9,3 +9,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Test a REST API with Java](http://www.baeldung.com/2011/10/13/integration-testing-a-rest-api/)
- [Introduction to WireMock](http://www.baeldung.com/introduction-to-wiremock)
- [REST API Testing with Cucumber](http://www.baeldung.com/cucumber-rest-api-testing)
+- [Testing a REST API with JBehave](http://www.baeldung.com/jbehave-rest-testing)
diff --git a/resteasy/README.md b/resteasy/README.md
index 722f1dfe93..83051037d2 100644
--- a/resteasy/README.md
+++ b/resteasy/README.md
@@ -6,3 +6,4 @@
### Relevant Articles:
- [A Guide to RESTEasy](http://www.baeldung.com/resteasy-tutorial)
- [RESTEasy Client API](http://www.baeldung.com/resteasy-client-tutorial)
+- [CORS in JAX-RS](http://www.baeldung.com/cors-in-jax-rs)
diff --git a/solr/README.md b/solr/README.md
new file mode 100644
index 0000000000..631a4f44d1
--- /dev/null
+++ b/solr/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Full-text Search with Solr](http://www.baeldung.com/full-text-search-with-solr)
diff --git a/spring-5/README.md b/spring-5/README.md
index 47a5314009..31f665f4a2 100644
--- a/spring-5/README.md
+++ b/spring-5/README.md
@@ -6,3 +6,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
### Relevant Articles
- [Concurrent Test Execution in Spring 5](http://www.baeldung.com/spring-5-concurrent-tests)
+- [Introduction to the Functional Web Framework in Spring 5](http://www.baeldung.com/spring-5-functional-web)
diff --git a/spring-all/README.md b/spring-all/README.md
index 3493871c78..29be01c79e 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -20,3 +20,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [A Guide to the Spring Task Scheduler](http://www.baeldung.com/spring-task-scheduler)
- [Guide to Spring Retry](http://www.baeldung.com/spring-retry)
- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
+- [New in Guava 21 common.util.concurrent](http://www.baeldung.com/guava-21-util-concurrent)
+- [A CLI with Spring Shell](http://www.baeldung.com/spring-shell-cli)
+- [JasperReports with Spring](http://www.baeldung.com/spring-jasper)
diff --git a/spring-aop/README.md b/spring-aop/README.md
new file mode 100644
index 0000000000..28295faf23
--- /dev/null
+++ b/spring-aop/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Implementing a Custom Spring AOP Annotation](http://www.baeldung.com/spring-aop-annotation)
diff --git a/spring-boot/README.MD b/spring-boot/README.MD
index bb15ffc8cc..dfd1327781 100644
--- a/spring-boot/README.MD
+++ b/spring-boot/README.MD
@@ -18,3 +18,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Create a Custom FailureAnalyzer with Spring Boot](http://www.baeldung.com/spring-boot-failure-analyzer)
- [Configuring Separate Spring DataSource for Tests](http://www.baeldung.com/spring-testing-separate-data-source)
- [Dynamic DTO Validation Config Retrieved from DB](http://www.baeldung.com/spring-dynamic-dto-validation)
+- [Custom Information in Spring Boot Info Endpoint](http://www.baeldung.com/spring-boot-info-actuator-custom)
+- [Using @JsonComponent in Spring Boot](http://www.baeldung.com/spring-boot-jsoncomponent)
diff --git a/spring-data-gemfire/README.md b/spring-data-gemfire/README.md
new file mode 100644
index 0000000000..78199e90d0
--- /dev/null
+++ b/spring-data-gemfire/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [A Guide to GemFire with Spring Data](http://www.baeldung.com/spring-data-gemfire)
diff --git a/spring-kafka/README.md b/spring-kafka/README.md
index c8f01cc28b..291bbca6f6 100644
--- a/spring-kafka/README.md
+++ b/spring-kafka/README.md
@@ -1,4 +1,10 @@
-# Spring Kakfa
+### Relevant articles
+
+- [Intro to Apache Kafka with Spring](http://www.baeldung.com/spring-kafka)
+
+
+
+# Spring Kafka
This is a simple Spring Boot app to demonstrate sending and receiving of messages in Kafka using spring-kafka.
@@ -12,18 +18,18 @@ As Kafka topics are not created automatically by default, this application requi
When the application runs successfully, following output is logged on to console (along with spring logs):
#### Message received from the 'baeldung' topic by the basic listeners with groups foo and bar
->Received Messasge in group 'foo': Hello, World!
-Received Messasge in group 'bar': Hello, World!
+>Received Message in group 'foo': Hello, World!
+Received Message in group 'bar': Hello, World!
#### Message received from the 'baeldung' topic, with the partition info
->Received Messasge: Hello, World! from partition: 0
+>Received Message: Hello, World! from partition: 0
#### Message received from the 'partitioned' topic, only from specific partitions
>Received Message: Hello To Partioned Topic! from partition: 0
Received Message: Hello To Partioned Topic! from partition: 3
#### Message received from the 'filtered' topic after filtering
->Recieved Message in filtered listener: Hello Baeldung!
+>Received Message in filtered listener: Hello Baeldung!
#### Message (Serialized Java Object) received from the 'greeting' topic
->Recieved greeting message: Greetings, World!!
\ No newline at end of file
+>Received greeting message: Greetings, World!!
diff --git a/spring-mvc-java/README.md b/spring-mvc-java/README.md
index 4d3e58558b..533d37fe00 100644
--- a/spring-mvc-java/README.md
+++ b/spring-mvc-java/README.md
@@ -21,3 +21,4 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Spring @RequestMapping New Shortcut Annotations](http://www.baeldung.com/spring-new-requestmapping-shortcuts)
- [Guide to Spring Handler Mappings](http://www.baeldung.com/spring-handler-mappings)
- [Uploading and Displaying Excel Files with Spring MVC](http://www.baeldung.com/spring-mvc-excel-files)
+- [Spring MVC Custom Validation](http://www.baeldung.com/spring-mvc-custom-validator)
diff --git a/spring-rest/README.md b/spring-rest/README.md
index 85f0e13732..66c893e45f 100644
--- a/spring-rest/README.md
+++ b/spring-rest/README.md
@@ -13,3 +13,5 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Guide to UriComponentsBuilder in Spring](http://www.baeldung.com/spring-uricomponentsbuilder)
- [Introduction to FindBugs](http://www.baeldung.com/intro-to-findbugs)
- [A Custom Media Type for a Spring REST API](http://www.baeldung.com/spring-rest-custom-media-type)
+- [HTTP PUT vs HTTP PATCH in a REST API](http://www.baeldung.com/http-put-patch-difference-spring)
+- [Exploring the Spring Boot TestRestTemplate](http://www.baeldung.com/spring-boot-testresttemplate)
diff --git a/spring-rest/src/main/java/com/baeldung/produceimage/README.md b/spring-rest/src/main/java/com/baeldung/produceimage/README.md
new file mode 100644
index 0000000000..acd546598d
--- /dev/null
+++ b/spring-rest/src/main/java/com/baeldung/produceimage/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Returning an Image or a File with Spring](http://www.baeldung.com/spring-controller-return-image-file)
diff --git a/spring-security-core/README.md b/spring-security-core/README.md
index 0eb506e865..3675e7e160 100644
--- a/spring-security-core/README.md
+++ b/spring-security-core/README.md
@@ -8,3 +8,4 @@ mvn clean install
### Relevant Articles:
- [Intro to @PreFilter and @PostFilter in Spring Security](http://www.baeldung.com/spring-security-prefilter-postfilter)
+- [Spring Boot Authentication Auditing Support](http://www.baeldung.com/spring-boot-authentication-audit)
diff --git a/spring-security-rest-full/README.md b/spring-security-rest-full/README.md
index e7f543a407..d5bd8be52b 100644
--- a/spring-security-rest-full/README.md
+++ b/spring-security-rest-full/README.md
@@ -30,6 +30,10 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com
- [Introduction to Spring MVC HandlerInterceptor](http://www.baeldung.com/spring-mvc-handlerinterceptor)
- [Using a Custom Spring MVC’s Handler Interceptor to Manage Sessions](http://www.baeldung.com/spring-mvc-custom-handler-interceptor)
- [Bootstrap a Web Application with Spring 4](http://www.baeldung.com/bootstraping-a-web-application-with-spring-and-java-based-configuration)
+- [REST Query Language – Implementing OR Operation](http://www.baeldung.com/rest-api-query-search-or-operation)
+
+
+
### Build the Project
```
diff --git a/spring-state-machine/README.md b/spring-state-machine/README.md
new file mode 100644
index 0000000000..a2668fb650
--- /dev/null
+++ b/spring-state-machine/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [A Guide to the Spring State Machine Project](http://www.baeldung.com/spring-state-machine)
diff --git a/testng/README.md b/testng/README.md
new file mode 100644
index 0000000000..0e3586c9f3
--- /dev/null
+++ b/testng/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Introduction to TestNG](http://www.baeldung.com/testng)
diff --git a/vertx/README.md b/vertx/README.md
new file mode 100644
index 0000000000..e710df362d
--- /dev/null
+++ b/vertx/README.md
@@ -0,0 +1,3 @@
+### Relevant articles
+
+- [Introduction to Vert.x](http://www.baeldung.com/vertx)
diff --git a/xml/README.md b/xml/README.md
index 8531f8b063..320089b088 100644
--- a/xml/README.md
+++ b/xml/README.md
@@ -1,2 +1,3 @@
### Relevant Articles:
- [Intro to XPath with Java](http://www.baeldung.com/java-xpath)
+- [Introduction to JiBX](http://www.baeldung.com/jibx)