diff --git a/enterprise-patterns/front-controller-pattern/pom.xml b/enterprise-patterns/front-controller-pattern/pom.xml
index dbcd4f1b1d..d1868b81af 100644
--- a/enterprise-patterns/front-controller-pattern/pom.xml
+++ b/enterprise-patterns/front-controller-pattern/pom.xml
@@ -31,7 +31,11 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
+<<<<<<< HEAD
+                <version>9.3.11.v20160721</version>
+=======
                 <version>9.4.0.M1</version>
+>>>>>>> upstream/master
                 <configuration>
                     <webApp>
                         <contextPath>/front-controller</contextPath>
diff --git a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java
index 4dfc12c050..a8962f5108 100644
--- a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java
+++ b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java
@@ -22,24 +22,17 @@ public class FrontControllerServlet extends HttpServlet {
 
     private FrontCommand getCommand(HttpServletRequest request) {
         try {
-            return (FrontCommand) getCommandClass(request)
-              .asSubclass(FrontCommand.class)
-              .newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to get command!", e);
-        }
-    }
-
-    private Class getCommandClass(HttpServletRequest request) {
-        try {
-            return Class.forName(
+            Class type = Class.forName(
               String.format(
                 "com.baeldung.enterprise.patterns.front.controller.commands.%sCommand",
                 request.getParameter("command")
               )
             );
-        } catch (ClassNotFoundException e) {
-            return UnknownCommand.class;
+            return (FrontCommand) type
+              .asSubclass(FrontCommand.class)
+              .newInstance();
+        } catch (Exception e) {
+            return new UnknownCommand();
         }
     }
 }
diff --git a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Book.java b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Book.java
index 634e05c3a0..abadcc0d76 100644
--- a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Book.java
+++ b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Book.java
@@ -1,40 +1,15 @@
 package com.baeldung.enterprise.patterns.front.controller.data;
 
-public class Book {
-    private String author;
-    private String title;
-    private Double price;
+public interface Book {
+    String getAuthor();
 
-    public Book() {
-    }
+    void setAuthor(String author);
 
-    public Book(String author, String title, Double price) {
-        this.author = author;
-        this.title = title;
-        this.price = price;
-    }
+    String getTitle();
 
-    public String getAuthor() {
-        return author;
-    }
+    void setTitle(String title);
 
-    public void setAuthor(String author) {
-        this.author = author;
-    }
+    Double getPrice();
 
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Double getPrice() {
-        return price;
-    }
-
-    public void setPrice(Double price) {
-        this.price = price;
-    }
+    void setPrice(Double price);
 }
diff --git a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/BookImpl.java b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/BookImpl.java
new file mode 100644
index 0000000000..b270bc7985
--- /dev/null
+++ b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/BookImpl.java
@@ -0,0 +1,46 @@
+package com.baeldung.enterprise.patterns.front.controller.data;
+
+public class BookImpl implements Book {
+    private String author;
+    private String title;
+    private Double price;
+
+    public BookImpl() {
+    }
+
+    public BookImpl(String author, String title, Double price) {
+        this.author = author;
+        this.title = title;
+        this.price = price;
+    }
+
+    @Override
+    public String getAuthor() {
+        return author;
+    }
+
+    @Override
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    @Override
+    public String getTitle() {
+        return title;
+    }
+
+    @Override
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public Double getPrice() {
+        return price;
+    }
+
+    @Override
+    public void setPrice(Double price) {
+        this.price = price;
+    }
+}
diff --git a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Bookshelf.java b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Bookshelf.java
index 524e000bd9..1e30452d95 100644
--- a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Bookshelf.java
+++ b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/data/Bookshelf.java
@@ -3,8 +3,8 @@ package com.baeldung.enterprise.patterns.front.controller.data;
 public interface Bookshelf {
 
     default void init() {
-        add(new Book("Wilson, Robert Anton & Shea, Robert", "Illuminati", 9.99));
-        add(new Book("Fowler, Martin", "Patterns of Enterprise Application Architecture", 27.88));
+        add(new BookImpl("Wilson, Robert Anton & Shea, Robert", "Illuminati", 9.99));
+        add(new BookImpl("Fowler, Martin", "Patterns of Enterprise Application Architecture", 27.88));
     }
 
     Bookshelf getInstance();
diff --git a/spring-cloud-config/README.md b/spring-cloud-config/README.md
new file mode 100644
index 0000000000..b8ebb2bfe9
--- /dev/null
+++ b/spring-cloud-config/README.md
@@ -0,0 +1,27 @@
+## Spring Cloud Config ##
+
+To get this example working, you have to initialize a new *Git* repository in
+the ```client-config``` directory first *and* you have to set the environment variable
+```CONFIG_REPO``` to an absolute path of that directory.
+
+```
+$> cd client-config
+$> git init
+$> git add .
+$> git commit -m 'Initial commit'
+$> export CONFIG_REPO=$(pwd)
+```
+
+Then you're able to run the examples with ```mvn install spring-boot:run```.
+
+### Docker ###
+
+To get the *Docker* examples working, you have to repackage the ```spring-cloud-config-server```
+and ```spring-cloud-config-client``` modules first:
+
+```
+$> mvn install spring-boot:repackage
+```
+
+Don't forget to download the *Java JCE* package from
+(Oracle)[http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html].
diff --git a/spring-cloud-config/docker/Dockerfile.client b/spring-cloud-config/docker/Dockerfile.client
new file mode 100644
index 0000000000..0f9293bd22
--- /dev/null
+++ b/spring-cloud-config/docker/Dockerfile.client
@@ -0,0 +1,6 @@
+FROM alpine-java:base
+MAINTAINER baeldung.com
+RUN apk --no-cache add netcat-openbsd
+COPY files/spring-cloud-config-client-1.0.0-SNAPSHOT.jar /opt/spring-cloud/lib/config-client.jar
+COPY files/config-client-entrypoint.sh /opt/spring-cloud/bin/
+RUN chmod 755 /opt/spring-cloud/bin/config-client-entrypoint.sh
diff --git a/spring-cloud-config/docker/Dockerfile.server b/spring-cloud-config/docker/Dockerfile.server
new file mode 100644
index 0000000000..90d7e2a7cf
--- /dev/null
+++ b/spring-cloud-config/docker/Dockerfile.server
@@ -0,0 +1,9 @@
+FROM alpine-java:base
+MAINTAINER baeldung.com
+COPY files/spring-cloud-config-server-1.0.0-SNAPSHOT.jar /opt/spring-cloud/lib/config-server.jar
+ENV SPRING_APPLICATION_JSON='{"spring": {"cloud": {"config": {"server": \
+    {"git": {"uri": "/var/lib/spring-cloud/config-repo", "clone-on-start": true}}}}}}'
+ENTRYPOINT ["/usr/bin/java"]
+CMD ["-jar", "/opt/spring-cloud/lib/config-server.jar"]
+VOLUME /var/lib/spring-cloud/config-repo
+EXPOSE 8888
diff --git a/spring-cloud-config/docker/files/.gitignore b/spring-cloud-config/docker/files/.gitignore
new file mode 100644
index 0000000000..28ffcbffdb
--- /dev/null
+++ b/spring-cloud-config/docker/files/.gitignore
@@ -0,0 +1,2 @@
+/UnlimitedJCEPolicyJDK8
+/*.jar
diff --git a/spring-cloud-config/docker/files/config-client-entrypoint.sh b/spring-cloud-config/docker/files/config-client-entrypoint.sh
new file mode 100644
index 0000000000..12352119fa
--- /dev/null
+++ b/spring-cloud-config/docker/files/config-client-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while ! nc -z config-server 8888 ; do
+    echo "Waiting for upcoming Config Server"
+    sleep 2
+done
+
+java -jar /opt/spring-cloud/lib/config-client.jar
diff --git a/spring-cloud-config/pom.xml b/spring-cloud-config/pom.xml
new file mode 100644
index 0000000000..3b1b59b037
--- /dev/null
+++ b/spring-cloud-config/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.baeldung.spring.cloud</groupId>
+    <artifactId>spring-cloud-config</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>spring-cloud-config-server</module>
+        <module>spring-cloud-config-client</module>
+    </modules>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-parent</artifactId>
+                <version>1.4.0.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Brixton.SR4</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>1.4.0.RELEASE</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>