diff --git a/.gitignore b/.gitignore
index 8e0dffaff..f476823d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ log/*
 cache/*
 node_modules/*
 .DS_Store
-npm-debug.log
\ No newline at end of file
+npm-debug.log
+/nbproject/*
\ No newline at end of file
diff --git a/config.json b/config.json
index 628fcb965..ae2f85d2f 100755
--- a/config.json
+++ b/config.json
@@ -6,6 +6,9 @@
 	"socketServerWelcomeMessage" : "Hello! Welcome to the actionHero api",
 	"apiBaseDir" : "./node_modules/actionHero/",
 	
+        "httpHeaders" : {
+        },
+        
 	"secureWebServer" : {
 		"port": 4443,
 		"enable": false,
diff --git a/initializers/initWebServer.js b/initializers/initWebServer.js
index 2f72f1dd9..923360857 100644
--- a/initializers/initWebServer.js
+++ b/initializers/initWebServer.js
@@ -39,8 +39,15 @@ var initWebServer = function(api, next)
 		connection.remoteIP = connection.req.connection.remoteAddress;
 		connection.responseHeaders = {
 			'Content-Type': "application/json",
-			"X-Powered-By": api.configData.serverName,
+			"X-Powered-By": api.configData.serverName
 		};
+                
+                if(typeof(api.configData.httpHeaders) != 'undefined'){
+                    for(var i in api.configData.httpHeaders){
+                        connection.responseHeaders[i] = api.configData.httpHeaders[i];
+                    }
+                }
+                
 		connection.responseHttpCode = 200;
 		if(connection.req.headers['x-forwarded-for'] != null)
 		{