diff --git a/LesionTracker/defaultSettings.js b/LesionTracker/defaultSettings.js
index 54376121a..8b33acb90 100644
--- a/LesionTracker/defaultSettings.js
+++ b/LesionTracker/defaultSettings.js
@@ -1,4 +1,10 @@
 Meteor.startup(function() {
+    if (Meteor.settings) {
+        console.log('Using custom LesionTracker settings');
+        console.log(Meteor.settings);
+        return;
+    }
+
     Meteor.settings = {
         dicomWeb: {
             endpoints: [{
diff --git a/OHIFViewer/defaultSettings.js b/OHIFViewer/defaultSettings.js
index 5fbfdef94..ef9d5f259 100644
--- a/OHIFViewer/defaultSettings.js
+++ b/OHIFViewer/defaultSettings.js
@@ -1,4 +1,10 @@
 Meteor.startup(function() {
+    if (Meteor.settings) {
+        console.log('Using custom LesionTracker settings: ');
+        console.log(Meteor.settings);
+        return;
+    }
+
     Meteor.settings = {
         dicomWeb: {
             endpoints: [{
diff --git a/config/dockerDCM4CHE.json b/config/dockerDCM4CHE.json
new file mode 100644
index 000000000..a820b39fc
--- /dev/null
+++ b/config/dockerDCM4CHE.json
@@ -0,0 +1,27 @@
+{
+  "dicomWeb" : {
+    "endpoints": [
+      {
+        "name": "DCM4CHE",
+        "wadoUriRootNOTE" : "either this uri is not correct for wado-uri or wado-uri is not configured on orthanc currently",
+        "wadoUriRoot" : "http://192.168.99.100:8080/dcm4chee-arc/aets/DCM4CHEE/wado",
+        "qidoRoot": "http://192.168.99.100:8080/dcm4chee-arc/aets/DCM4CHEE/rs",
+        "wadoRoot": "http://192.168.99.100:8080/dcm4chee-arc/aets/DCM4CHEE/rs",
+        "qidoSupportsIncludeField": false,
+        "imageRendering" : "wadouri",
+        "requestOptions" : {
+          "auth": "user:user",
+          "logRequests" : true,
+          "logResponses" : false,
+          "logTiming" : true
+        }
+      }
+    ]
+  },
+  "dimse" : {
+    "host" : "192.168.99.100",
+    "port" : 11112,
+    "hostAE" : "DCM4CHE"
+  },
+  "defaultServiceType": "dicomWeb"
+}
diff --git a/etc/dcm4cheCORSproxy.js b/etc/dcm4cheCORSproxy.js
new file mode 100644
index 000000000..a113539a5
--- /dev/null
+++ b/etc/dcm4cheCORSproxy.js
@@ -0,0 +1,21 @@
+// This sets up a proxy to work around CORS.
+// See http://chafey.blogspot.be/2014/09/working-around-cors.html
+// For more information
+var http = require('http'),
+    httpProxy = require('http-proxy');
+
+var proxy =  httpProxy.createProxyServer({
+    target: 'http://192.168.99.100:8080',
+    auth: 'user:user'
+}).listen(8080);
+
+proxy.on('proxyRes', function(proxyReq, req, res, options) {
+  // add the CORS header to the response
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  console.log(proxyReq);
+});
+
+proxy.on('error', function(e) {
+  // suppress errors
+  console.log(e);
+});