diff --git a/package.json b/package.json
index 18c0130..55160d9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grunt-rsimulatorjs",
   "description": "Grunt plugin for rsimulatorjs-server",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "homepage": "https://github.com/baelter/grunt-rsimulatorjs",
   "author": {
     "name": "Anders Bälter",
diff --git a/tasks/rsimulatorjs.js b/tasks/rsimulatorjs.js
index 47e0974..460ad23 100644
--- a/tasks/rsimulatorjs.js
+++ b/tasks/rsimulatorjs.js
@@ -20,32 +20,29 @@ module.exports = function(grunt) {
                     port: 9005,
                     rootPath: './mocked-rest-api',
                     useRootRelativePath: true
-                },
-                proxy: {
-                    port : 9004,
-                    pathnameOnly : true,
-                    router : {
-                        '/service' : '127.0.0.1:' + 9005,
-                        '' : '127.0.0.1:' + 9001
-                    }
                 }
             }),
             serverOptions = {
-                simulatorConfig: options.simulator,
-                proxyConfig: {
+                simulatorConfig: options.simulator
+            };
+            if (options.proxy) {
+                serverOptions.proxyConfig = {
                     port: options.proxy.port || 9004,
                     options: {
                         pathnameOnly: options.proxy.pathnameOnly || true,
                         router: options.proxy.router
                     }
                 }
-            };
+            }
         grunt.verbose.writeln('Grunt-rsimulatorjs options: ', JSON.stringify(options));
         rsimulatorjsServer(serverOptions);
-        grunt.log.ok('Started rsimulator on ' + serverOptions.simulatorConfig.port + ' with proxy on ' + serverOptions.proxyConfig.port + ' with the following routes:');
-        for(route in serverOptions.proxyConfig.options.router) {
-            grunt.log.ok(route + ' : ' + serverOptions.proxyConfig.options.router[route]);
+        grunt.log.ok('Started rsimulator on ' + serverOptions.simulatorConfig.port);
+        if (serverOptions.proxyConfig) {
+            grunt.log.ok(' with proxy on ' + serverOptions.proxyConfig.port + ' with the following routes:');
+            
+            for(route in serverOptions.proxyConfig.options.router) {
+                grunt.log.ok(route + ' : ' + serverOptions.proxyConfig.options.router[route]);
+            }
         }
     });
-
-};
+};
\ No newline at end of file