diff --git a/Dockerfile b/Dockerfile
index f5f005e..4ed65a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6-stretch
+FROM node:6.15.1-stretch
 MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
 
 ENV NODE_ENV="production"
@@ -21,6 +21,7 @@ RUN apt-get -qq update \
     libprotobuf-dev \
     libxxf86vm-dev \
     xvfb \
+    x11-utils \
 && apt-get clean
 
 RUN mkdir -p /usr/src/app
diff --git a/Dockerfile_light b/Dockerfile_light
index b3926ee..2c3c575 100644
--- a/Dockerfile_light
+++ b/Dockerfile_light
@@ -1,4 +1,4 @@
-FROM node:6
+FROM node:6.15.1-stretch
 MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
 
 ENV NODE_ENV="production"
diff --git a/Dockerfile_test b/Dockerfile_test
new file mode 100644
index 0000000..baaa989
--- /dev/null
+++ b/Dockerfile_test
@@ -0,0 +1,35 @@
+# Run tests inside docker without requiring full installation of dependencies on local machine
+# Simply run "docker build -f Dockerfile_test ."
+# WARNING: sometimes it fails with a core dumped exception
+
+FROM node:6-stretch
+MAINTAINER Petr Sloup <petr.sloup@klokantech.com>
+
+RUN apt-get -qq update \
+&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    apt-transport-https \
+    curl \
+    unzip \
+    build-essential \
+    python \
+    libcairo2-dev \
+    libgles2-mesa-dev \
+    libgbm-dev \
+    libllvm3.9 \
+    libprotobuf-dev \
+    libxxf86vm-dev \
+    xvfb \
+&& apt-get clean
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+RUN wget -O test_data.zip https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/test_data.zip
+RUN unzip -q test_data.zip -d test_data
+
+ENV NODE_ENV="test"
+
+COPY package.json .
+RUN npm install
+COPY / .
+RUN xvfb-run --server-args="-screen 0 1024x768x24" npm test
diff --git a/package.json b/package.json
index 21d3837..8fb77c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tileserver-gl",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
   "main": "src/main.js",
   "bin": "src/main.js",
@@ -19,17 +19,17 @@
     "test": "mocha test/**.js --timeout 10000"
   },
   "dependencies": {
-    "@mapbox/mapbox-gl-native": "3.5.4",
+    "@mapbox/mapbox-gl-native": "4.0.0",
     "@mapbox/mbtiles": "0.10.0",
     "@mapbox/sphericalmercator": "1.1.0",
     "@mapbox/vector-tile": "1.3.1",
     "advanced-pool": "0.3.3",
-    "canvas": "1.6.12",
+    "canvas": "1.6.13",
     "clone": "2.1.2",
-    "color": "3.0.0",
-    "commander": "2.18.0",
-    "cors": "2.8.4",
-    "express": "4.16.3",
+    "color": "3.1.0",
+    "commander": "2.19.0",
+    "cors": "2.8.5",
+    "express": "4.16.4",
     "glyph-pbf-composite": "0.0.2",
     "handlebars": "4.0.12",
     "http-shutdown": "^1.2.0",
@@ -37,7 +37,7 @@
     "pbf": "3.1.0",
     "proj4": "2.5.0",
     "request": "2.88.0",
-    "sharp": "0.20.8",
+    "sharp": "0.21.1",
     "tileserver-gl-styles": "1.2.0"
   },
   "devDependencies": {
diff --git a/public/resources/index.css b/public/resources/index.css
index 6438b2e..8b5feb7 100644
--- a/public/resources/index.css
+++ b/public/resources/index.css
@@ -28,7 +28,7 @@ a{
   color: #499DCE;
   transition: color .2s;
 }
-a:hover{
+a:hover {
   color: #395D73;
 }
 .title {
@@ -47,7 +47,7 @@ a:hover{
   color: #499DCE;
   font-size:.8em;
 }
-section{
+section {
   margin: 15px auto;
   width: 930px;
   padding: 30px 0;
@@ -70,7 +70,7 @@ section{
   font-size:20px;
   background:#fff;
 }
-.item{
+.item {
   background:#fff;
   height: 191px;
   border: 1px solid #ededed;
@@ -79,7 +79,7 @@ section{
 .item:nth-child(odd) {
   background-color:#fbfbfb;
 }
-.item img{
+.item img {
   position: absolute;
   margin: 30px;
   width: 128px;
@@ -122,10 +122,10 @@ section{
   text-decoration: none;
   font-weight: bold;
 }
-.btn:first-child:hover{
+.btn:first-child:hover {
   background: #395D73;
 }
-footer{
+footer {
   width:100%;
   border-top:1px solid #ededed;
   text-align:center;
@@ -133,7 +133,7 @@ footer{
   padding-top:10px;
   font-size:12px;
 }
-footer img{
+footer img {
   width: 118px;
   height: 32px;
 }
@@ -147,6 +147,10 @@ footer a {
   color: #787878;
   text-decoration: none;
 }
+.details h3, .identifier {
+  max-width: 550px;
+  word-break: break-all;
+}
 
 /* body background image */
 body {
@@ -185,31 +189,31 @@ body {
   .title.light:after {
     font-size:.6em;
   }
-  .title img{
+  .title img {
     width: 200px;
   }
-  .subtitle{
+  .subtitle {
     font-size: 20px;
     margin: 0 0 35px 0;
   }
-  .item{
+  .item {
     height: 245px;
   }
-  .viewers{
+  .viewers {
     float: left;
     text-align: left;
     width: 100%;
     margin-left: 30px;
     margin-top: 15px;
   }
-  .viewers a{
+  .viewers a {
     display: inline-block;
     vertical-align: middle;
   }
-  .btn{
+  .btn {
     margin: 0 20px 0 0;
   }
-  .btn:first-child{
+  .btn:first-child {
     padding: 0 20px;
   }
 }
diff --git a/public/templates/data.tmpl b/public/templates/data.tmpl
index 3d05522..a95388e 100644
--- a/public/templates/data.tmpl
+++ b/public/templates/data.tmpl
@@ -5,10 +5,10 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>{{name}} - TileServer GL</title>
   {{#is_vector}}
-  <link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" />
-  <link rel="stylesheet" type="text/css" href="/mapbox-gl-inspect.css{{&key_query}}" />
-  <script src="/mapbox-gl.js{{&key_query}}"></script>
-  <script src="/mapbox-gl-inspect.min.js{{&key_query}}"></script>
+  <link rel="stylesheet" type="text/css" href="{{public_url}}mapbox-gl.css{{&key_query}}" />
+  <link rel="stylesheet" type="text/css" href="{{public_url}}mapbox-gl-inspect.css{{&key_query}}" />
+  <script src="{{public_url}}mapbox-gl.js{{&key_query}}"></script>
+  <script src="{{public_url}}mapbox-gl-inspect.min.js{{&key_query}}"></script>
   <style>
     body {background:#fff;color:#333;font-family:Arial, sans-serif;}
     #map {position:absolute;top:0;left:0;right:250px;bottom:0;}
@@ -18,9 +18,9 @@
   </style>
   {{/is_vector}}
   {{^is_vector}}
-  <link rel="stylesheet" type="text/css" href="/mapbox.css{{&key_query}}" />
-  <script src="/mapbox.js{{&key_query}}"></script>
-  <script src="/leaflet-hash.js{{&key_query}}"></script>
+  <link rel="stylesheet" type="text/css" href="{{public_url}}mapbox.css{{&key_query}}" />
+  <script src="{{public_url}}mapbox.js{{&key_query}}"></script>
+  <script src="{{public_url}}leaflet-hash.js{{&key_query}}"></script>
   <style>
     body { margin:0; padding:0; }
     #map { position:absolute; top:0; bottom:0; width:100%; }
@@ -42,7 +42,7 @@
       sources: {
         'vector_layer_': {
           type: 'vector',
-          url: '/data/{{id}}.json{{&key_query}}'
+          url: '{{public_url}}data/{{id}}.json{{&key_query}}'
         }
       },
       layers: []
@@ -74,7 +74,7 @@
   <h1 style="display:none;">{{name}}</h1>
   <div id='map'></div>
   <script>
-    var map = L.mapbox.map('map', '/data/{{id}}.json{{&key_query}}', { zoomControl: false });
+    var map = L.mapbox.map('map', '{{public_url}}data/{{id}}.json{{&key_query}}', { zoomControl: false });
     map.eachLayer(function(layer) {
       // do not add scale prefix even if retina display is detected
       layer.scalePrefix = '.';
diff --git a/public/templates/index.tmpl b/public/templates/index.tmpl
index 2c61428..191496d 100644
--- a/public/templates/index.tmpl
+++ b/public/templates/index.tmpl
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>TileServer GL - Server for vector and raster maps with GL styles</title>
-  <link rel="stylesheet" type="text/css" href="/index.css{{&key_query}}" />
+  <link rel="stylesheet" type="text/css" href="{{public_url}}index.css{{&key_query}}" />
   <script>
     function toggle_xyz(id) {
       var el = document.getElementById(id);
@@ -17,7 +17,7 @@
 </head>
 <body>
   <section>
-    <h1 class="title {{#if is_light}}light{{/if}}"><img src="/images/logo.png" alt="TileServer GL" /></h1>
+    <h1 class="title {{#if is_light}}light{{/if}}"><img src="{{public_url}}images/logo.png" alt="TileServer GL" /></h1>
     <h2 class="subtitle">Vector {{#if is_light}}<s>and raster</s>{{else}}and raster{{/if}} maps with GL styles</h2>
     {{#if styles}}
       <h2 class="box-header">Styles</h2>
@@ -25,9 +25,9 @@
       {{#each styles}}
         <div class="item">
           {{#if thumbnail}}
-            <img src="/styles/{{@key}}/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
+            <img src="{{public_url}}styles/{{@key}}/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
           {{else}}
-            <img src="/images/placeholder.png" alt="{{name}} preview" />
+            <img src="{{public_url}}images/placeholder.png" alt="{{name}} preview" />
           {{/if}}
           <div class="details">
             <h3>{{name}}</h3>
@@ -35,10 +35,10 @@
             <p class="services">
               services:
               {{#if serving_data}}
-                <a href="/styles/{{@key}}/style.json{{&../key_query}}">GL Style</a>
+                <a href="{{public_url}}styles/{{@key}}/style.json{{&../key_query}}">GL Style</a>
               {{/if}}
               {{#if serving_rendered}}
-                {{#if serving_data}}| {{/if}}<a href="/styles/{{@key}}.json{{&../key_query}}">TileJSON</a>
+                {{#if serving_data}}| {{/if}}<a href="{{public_url}}styles/{{@key}}.json{{&../key_query}}">TileJSON</a>
               {{/if}}
               {{#if serving_rendered}}
                 | <a href="/styles/{{@key}}/wmts.xml{{&../key_query}}">WMTS</a>
@@ -52,14 +52,14 @@
           <div class="viewers">
             {{#if serving_data}}
               {{#if serving_rendered}}
-                <a class="btn" href="/styles/{{@key}}/{{&../key_query}}{{viewer_hash}}">Viewer</a>
+                <a class="btn" href="{{public_url}}styles/{{@key}}/{{&../key_query}}{{viewer_hash}}">Viewer</a>
               {{/if}}
             {{/if}}
             {{#if serving_rendered}}
-              <a class="btn" href="/styles/{{@key}}/?{{&../key_query_part}}raster{{viewer_hash}}">Raster</a>
+              <a class="btn" href="{{public_url}}styles/{{@key}}/?{{&../key_query_part}}raster{{viewer_hash}}">Raster</a>
             {{/if}}
             {{#if serving_data}}
-              <a class="btn" href="/styles/{{@key}}/?{{&../key_query_part}}vector{{viewer_hash}}">Vector</a>
+              <a class="btn" href="{{public_url}}styles/{{@key}}/?{{&../key_query_part}}vector{{viewer_hash}}">Vector</a>
             {{/if}}
           </div>
         </div>
@@ -72,15 +72,15 @@
       {{#each data}}
         <div class="item">
           {{#if thumbnail}}
-            <img src="/data/{{@key}}/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
+            <img src="{{public_url}}data/{{@key}}/{{thumbnail}}{{&../key_query}}" alt="{{name}} preview" />
           {{else}}
-            <img src="/images/placeholder.png" alt="{{name}} preview" />
+            <img src="{{public_url}}images/placeholder.png" alt="{{name}} preview" />
           {{/if}}
           <div class="details">
             <h3>{{name}}</h3>
             <p class="identifier">identifier: {{@key}}{{#if formatted_filesize}} | size: {{formatted_filesize}}{{/if}} | type: {{#is_vector}}vector{{/is_vector}}{{^is_vector}}raster{{/is_vector}} data</p>
             <p class="services">
-              services: <a href="/data/{{@key}}.json{{&../key_query}}">TileJSON</a>
+              services: <a href="{{public_url}}data/{{@key}}.json{{&../key_query}}">TileJSON</a>
               {{#if wmts_link}}
                 | <a href="{{&wmts_link}}">WMTS</a>
               {{/if}}
@@ -92,10 +92,10 @@
           </div>
           <div class="viewers">
             {{#is_vector}}
-            <a class="btn" href="/data/{{@key}}/{{&../key_query}}{{viewer_hash}}">Inspect</a>
+            <a class="btn" href="{{public_url}}data/{{@key}}/{{&../key_query}}{{viewer_hash}}">Inspect</a>
             {{/is_vector}}
             {{^is_vector}}
-            <a class="btn" href="/data/{{@key}}/{{&../key_query}}{{viewer_hash}}">View</a>
+            <a class="btn" href="{{public_url}}data/{{@key}}/{{&../key_query}}{{viewer_hash}}">View</a>
             {{/is_vector}}
           </div>
         </div>
@@ -104,7 +104,7 @@
     {{/if}}
   </section>
   <footer>
-    <a href="https://www.klokantech.com/" target="_blank"><img src="/images/klokantech.png" /></a>
+    <a href="https://www.klokantech.com/" target="_blank"><img src="{{public_url}}images/klokantech.png" /></a>
     <p>
       <a href="https://github.com/klokantech/tileserver-gl" target="_blank">Powered by TileServer GL ({{server_version}})</a> – <a href="https://www.klokantech.com/" target="_blank">an open-source project from Klokan Technologies GmbH.</a> <img src="https://t.klokantech.com/8073932/19" class="t" />
     </p>
diff --git a/public/templates/viewer.tmpl b/public/templates/viewer.tmpl
index 243848f..8274812 100644
--- a/public/templates/viewer.tmpl
+++ b/public/templates/viewer.tmpl
@@ -4,11 +4,11 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>{{name}} - TileServer GL</title>
-  <link rel="stylesheet" type="text/css" href="/mapbox-gl.css{{&key_query}}" />
-  <script src="/mapbox-gl.js{{&key_query}}"></script>
-  <link rel="stylesheet" type="text/css" href="/mapbox.css{{&key_query}}" />
-  <script src="/mapbox.js{{&key_query}}"></script>
-  <script src="/leaflet-hash.js{{&key_query}}"></script>
+  <link rel="stylesheet" type="text/css" href="{{public_url}}mapbox-gl.css{{&key_query}}" />
+  <script src="{{public_url}}mapbox-gl.js{{&key_query}}"></script>
+  <link rel="stylesheet" type="text/css" href="{{public_url}}mapbox.css{{&key_query}}" />
+  <script src="{{public_url}}mapbox.js{{&key_query}}"></script>
+  <script src="{{public_url}}leaflet-hash.js{{&key_query}}"></script>
   <style>
     body { margin:0; padding:0; }
     #map { position:absolute; top:0; bottom:0; width:100%; }
@@ -24,15 +24,15 @@
         (q.indexOf('raster') >= 0 ? 'raster' :
           (mapboxgl.supported() ? 'vector' : 'raster'));
     if (preference == 'vector') {
-      mapboxgl.setRTLTextPlugin('/mapbox-gl-rtl-text.js{{&key_query}}');
+      mapboxgl.setRTLTextPlugin('{{public_url}}mapbox-gl-rtl-text.js{{&key_query}}');
       var map = new mapboxgl.Map({
         container: 'map',
-        style: '/styles/{{id}}/style.json{{&key_query}}',
+        style: '{{public_url}}styles/{{id}}/style.json{{&key_query}}',
         hash: true
       });
       map.addControl(new mapboxgl.NavigationControl());
     } else {
-      var map = L.mapbox.map('map', '/styles/{{id}}.json{{&key_query}}', { zoomControl: false });
+      var map = L.mapbox.map('map', '{{public_url}}styles/{{id}}.json{{&key_query}}', { zoomControl: false });
       new L.Control.Zoom({ position: 'topright' }).addTo(map);
       setTimeout(function() {
         new L.Hash(map);
diff --git a/run.sh b/run.sh
index 7b6c1bf..829163d 100755
--- a/run.sh
+++ b/run.sh
@@ -5,17 +5,29 @@ _term() {
 	kill -TERM "$child" 2>/dev/null
 }
 
-trap _term TERM
+trap _term SIGTERM
+trap _term SIGINT
+
+xvfbMaxStartWaitTime=5
+displayNumber=99
+screenNumber=0
 
 # Delete files if they were not cleaned by last run
-rm -rf /tmp/.X11-unix /tmp/.X99-lock
+rm -rf /tmp/.X11-unix /tmp/.X${displayNumber}-lock ~/xvfb.pid
 
-start-stop-daemon --start --pidfile ~/xvfb.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset
-echo "Waiting 3 seconds for xvfb to start..."
-sleep 3
+echo "Starting Xvfb on display ${displayNumber}"
+start-stop-daemon --start --pidfile ~/xvfb.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :${displayNumber} -screen ${screenNumber} 1024x768x24  -ac +extension GLX +render -noreset
 
-export DISPLAY=:99.0
+# Wait to be able to connect to the port. This will exit if it cannot in 15 minutes.
+timeout ${xvfbMaxStartWaitTime} bash -c "while  ! xdpyinfo -display :${displayNumber} >/dev/null; do sleep 0.5; done"
+if [ $? -ne 0 ]; then
+  echo "Could not connect to display ${displayNumber} in ${xvfbMaxStartWaitTime} seconds time."
+  exit 1
+fi
 
+export DISPLAY=:${displayNumber}.${screenNumber}
+
+echo
 cd /data
 node /usr/src/app/ -p 80 "$@" &
 child=$!
diff --git a/src/main.js b/src/main.js
index bbb0711..416a99e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -42,6 +42,10 @@ var opts = require('commander')
     '-C|--no-cors',
     'Disable Cross-origin resource sharing headers'
   )
+  .option(
+    '-u|--public_url',
+    'Enable exposing the server on subpaths, not necessarily the root of the domain'
+  )
   .option(
     '-V, --verbose',
     'More verbose output'
@@ -59,13 +63,18 @@ var opts = require('commander')
 console.log('Starting ' + packageJson.name + ' v' + packageJson.version);
 
 var startServer = function(configPath, config) {
+  var publicUrl = opts.public_url;
+  if (publicUrl && publicUrl.lastIndexOf('/') !== publicUrl.length - 1) {
+    publicUrl += '/';
+  }
   return require('./server')({
     configPath: configPath,
     config: config,
     bind: opts.bind,
     port: opts.port,
     cors: opts.cors,
-    silent: opts.silent
+    silent: opts.silent,
+    publicUrl: publicUrl
   });
 };
 
diff --git a/src/serve_data.js b/src/serve_data.js
index 044a22d..7b885ef 100644
--- a/src/serve_data.js
+++ b/src/serve_data.js
@@ -18,7 +18,7 @@ try {
 
 var utils = require('./utils');
 
-module.exports = function(options, repo, params, id, styles) {
+module.exports = function(options, repo, params, id, styles, publicUrl) {
   var app = express().disable('x-powered-by');
 
   var mbtilesFile = path.resolve(options.paths.mbtiles, params.mbtiles);
@@ -178,7 +178,7 @@ module.exports = function(options, repo, params, id, styles) {
   app.get('/' + id + '.json', function(req, res, next) {
     var info = clone(tileJSON);
     info.tiles = utils.getTileUrls(req, info.tiles,
-                                   'data/' + id, info.format, {
+                                   'data/' + id, info.format, publicUrl, {
                                      'pbf': options.pbfAlias
                                    });
     return res.send(info);
diff --git a/src/serve_rendered.js b/src/serve_rendered.js
index aca8295..3c8f641 100644
--- a/src/serve_rendered.js
+++ b/src/serve_rendered.js
@@ -97,7 +97,7 @@ function createEmptyResponse(format, color, callback) {
   });
 }
 
-module.exports = function(options, repo, params, id, dataResolver) {
+module.exports = function(options, repo, params, id, publicUrl, dataResolver) {
   var app = express().disable('x-powered-by');
 
   var maxScaleFactor = Math.min(Math.floor(options.maxScaleFactor || 3), 9);
@@ -747,7 +747,7 @@ module.exports = function(options, repo, params, id, dataResolver) {
   app.get('/' + id + '.json', function(req, res, next) {
     var info = clone(tileJSON);
     info.tiles = utils.getTileUrls(req, info.tiles,
-                                   'styles/' + id, info.format);
+                                   'styles/' + id, info.format, publicUrl);
     return res.send(info);
   });
 
diff --git a/src/serve_style.js b/src/serve_style.js
index e9a7738..f9c5782 100644
--- a/src/serve_style.js
+++ b/src/serve_style.js
@@ -6,8 +6,9 @@ var path = require('path'),
 var clone = require('clone'),
     express = require('express');
 
+var utils = require('./utils');
 
-module.exports = function(options, repo, params, id, reportTiles, reportFont) {
+module.exports = function(options, repo, params, id, publicUrl, reportTiles, reportFont) {
   var app = express().disable('x-powered-by');
 
   var styleFile = path.resolve(options.paths.styles, params.style);
@@ -79,7 +80,11 @@ module.exports = function(options, repo, params, id, reportTiles, reportFont) {
         query = '?' + queryParams.join('&');
       }
       return url.replace(
+<<<<<<< HEAD
           'local://', req.protocol + '://' + req.hostname + '/') + query;
+=======
+          'local://', utils.getPublicUrl(publicUrl, req)) + query;
+>>>>>>> a1a8996d3f5354c878a87473efafb581ae878e50
     };
 
     var styleJSON_ = clone(styleJSON);
diff --git a/src/server.js b/src/server.js
index 2256c2b..baec98c 100644
--- a/src/server.js
+++ b/src/server.js
@@ -112,7 +112,7 @@ function start(opts) {
     }
 
     if (item.serve_data !== false) {
-      startupPromises.push(serve_style(options, serving.styles, item, id,
+      startupPromises.push(serve_style(options, serving.styles, item, id, opts.publicUrl,
         function(mbtiles, fromData) {
           var dataItemId;
           Object.keys(data).forEach(function(id) {
@@ -148,7 +148,7 @@ function start(opts) {
     if (item.serve_rendered !== false) {
       if (serve_rendered) {
         startupPromises.push(
-          serve_rendered(options, serving.rendered, item, id,
+          serve_rendered(options, serving.rendered, item, id, opts.publicUrl,
             function(mbtiles) {
               var mbtilesFile;
               Object.keys(data).forEach(function(id) {
@@ -182,7 +182,7 @@ function start(opts) {
     }
 
     startupPromises.push(
-      serve_data(options, serving.data, item, id, serving.styles).then(function(sub) {
+      serve_data(options, serving.data, item, id, serving.styles, opts.publicUrl).then(function(sub) {
         app.use('/data/', sub);
       })
     );
@@ -197,7 +197,11 @@ function start(opts) {
         version: styleJSON.version,
         name: styleJSON.name,
         id: id,
+<<<<<<< HEAD
         url: req.protocol + '://' + req.hostname +
+=======
+        url: utils.getPublicUrl(opts.publicUrl, req) +
+>>>>>>> a1a8996d3f5354c878a87473efafb581ae878e50
              '/styles/' + id + '/style.json' + query
       });
     });
@@ -213,7 +217,7 @@ function start(opts) {
       } else {
         path = type + '/' + id;
       }
-      info.tiles = utils.getTileUrls(req, info.tiles, path, info.format, {
+      info.tiles = utils.getTileUrls(req, info.tiles, path, info.format, opts.publicUrl, {
         'pbf': options.pbfAlias
       });
       arr.push(info);
@@ -264,6 +268,7 @@ function start(opts) {
             }
           }
           data['server_version'] = packageJson.name + ' v' + packageJson.version;
+          data['public_url'] = opts.publicUrl || '/';
           data['is_light'] = isLight;
           data['key_query_part'] =
               req.query.key ? 'key=' + req.query.key + '&amp;' : '';
@@ -295,10 +300,10 @@ function start(opts) {
               Math.floor(centerPx[0] / 256) + '/' +
               Math.floor(centerPx[1] / 256) + '.png';
         }
-        
+
         var tiles = utils.getTileUrls(
             req, style.serving_rendered.tiles,
-            'styles/' + id, style.serving_rendered.format);
+            'styles/' + id, style.serving_rendered.format, opts.publicUrl);
         style.xyz_link = tiles[0];
       }
     });
@@ -321,7 +326,7 @@ function start(opts) {
         }
 
         var tiles = utils.getTileUrls(
-            req, data_.tiles, 'data/' + id, data_.format, {
+            req, data_.tiles, 'data/' + id, data_.format, opts.publicUrl, {
               'pbf': options.pbfAlias
             });
         data_.xyz_link = tiles[0];
diff --git a/src/utils.js b/src/utils.js
index fe3185c..4b5ef5a 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -6,7 +6,12 @@ var path = require('path'),
 var clone = require('clone'),
     glyphCompose = require('glyph-pbf-composite');
 
-module.exports.getTileUrls = function(req, domains, path, format, aliases) {
+
+module.exports.getPublicUrl = function(publicUrl, req) {
+  return publicUrl || (req.protocol + '://' + req.headers.host + '/')
+}
+
+module.exports.getTileUrls = function(req, domains, path, format, publicUrl, aliases) {
 
   if (domains) {
     if (domains.constructor === String && domains.length > 0) {
@@ -49,10 +54,14 @@ module.exports.getTileUrls = function(req, domains, path, format, aliases) {
   }
 
   var uris = [];
-  domains.forEach(function(domain) {
-    uris.push(req.protocol + '://' + domain + '/' + path +
-              '/{z}/{x}/{y}.' + format + query);
-  });
+  if (!publicUrl) {
+    domains.forEach(function(domain) {
+      uris.push(req.protocol + '://' + domain + '/' + path +
+                '/{z}/{x}/{y}.' + format + query);
+    });
+  } else {
+    uris.push(publicUrl + path + '/{z}/{x}/{y}.' + format + query)
+  }
 
   return uris;
 };
diff --git a/test/setup.js b/test/setup.js
index ce4442f..2edaab0 100644
--- a/test/setup.js
+++ b/test/setup.js
@@ -8,7 +8,8 @@ before(function() {
   process.chdir('test_data');
   var running = require('../src/server')({
     configPath: 'config.json',
-    port: 8888
+    port: 8888,
+    publicUrl: '/test/'
   });
   global.app = running.app;
   global.server = running.server;
diff --git a/test/style.js b/test/style.js
index cf4be9a..938798d 100644
--- a/test/style.js
+++ b/test/style.js
@@ -23,6 +23,7 @@ describe('Styles', function() {
           res.body.sources.should.be.Object();
           res.body.glyphs.should.be.String();
           res.body.sprite.should.be.String();
+          res.body.sprite.should.equal('/test/styles/test-style/sprite');
           res.body.layers.should.be.Array();
         }).end(done);
     });