diff --git a/demo/phpThumb.demo.gallery.php b/demo/phpThumb.demo.gallery.php
index 3e9e02e..f298f41 100644
--- a/demo/phpThumb.demo.gallery.php
+++ b/demo/phpThumb.demo.gallery.php
@@ -24,18 +24,21 @@
 die('For security reasons, this demo is disabled by default. Please comment out line '.__LINE__.' in '.basename(__FILE__));
 
 $docroot = realpath((getenv('DOCUMENT_ROOT') && preg_match('#^'.preg_quote(realpath(getenv('DOCUMENT_ROOT'))).'#', realpath(__FILE__))) ? getenv('DOCUMENT_ROOT') : str_replace(dirname(@$_SERVER['PHP_SELF']), '', str_replace(DIRECTORY_SEPARATOR, '/', dirname(__FILE__))));
-$basedir = '/demo/images/';                         // webroot-relative path to main images directory (only this and subdirectories of this will be displayed)
-$thumb   = '/demo/phpThumb.php';                    // webroot-relative path to "phpThumb.php"
-$popup   = '/demo/demo/phpThumb.demo.showpic.php';  // webroot-relative path to "phpThumb.demo.showpic.php" (only used if $use_popup == true)
-$thumbnailsize = 120;                               // size of thumbnails in pixels when browsing gallery
-$displaysize   = 480;                               // size of large image display (popup or plain image) after clicking on thumbnail
-$use_popup     = true;                              // if true, open large image in self-resizing popup window; if false, display larger image in main window
+$imgdir = '/images/';                        // webroot-relative path to main images directory (only this and subdirectories of this will be displayed)
+$thumb  = '/phpThumb.php';                   // webroot-relative path to "phpThumb.php"
+$config = '/phpThumb.config.php';            // webroot-relative path to "phpThumb.php"
+$popup  = '/demo/phpThumb.demo.showpic.php'; // webroot-relative path to "phpThumb.demo.showpic.php" (only used if $use_popup == true)
+$thumbnailsize = 120;                        // size of thumbnails in pixels when browsing gallery
+$displaysize   = 480;                        // size of large image display (popup or plain image) after clicking on thumbnail
+$use_popup     = true;                       // if true, open large image in self-resizing popup window; if false, display larger image in main window
 
 //////////////////////////////////////////////////////////////
 
-$dirlimit = realpath($docroot.'/'.$basedir);
+require_once($docroot.$config);
 
-$captionfile = $docroot.'/'.$basedir.(@$_REQUEST['dir'] ? $_REQUEST['dir'].'/' : '').'captions.txt';
+$dirlimit = realpath($docroot.'/'.$imgdir);
+
+$captionfile = $docroot.'/'.$imgdir.(@$_REQUEST['dir'] ? $_REQUEST['dir'].'/' : '').'captions.txt';
 if (file_exists($captionfile)) {
 	$filecontents = file($captionfile);
 	foreach ($filecontents as $key => $value) {
@@ -47,12 +50,12 @@
 if (!empty($_REQUEST['pic'])) {
 
 	$alt = @$CAPTIONS[$_REQUEST['pic']] ? $CAPTIONS[$_REQUEST['pic']] : $_REQUEST['pic'];
-	echo '<img src="'.$thumb.'?src='.htmlentities(urlencode($basedir.@$_REQUEST['dir'].'/'.$_REQUEST['pic']).'&w='.$displaysize.'&h='.$displaysize).'" border="0" alt="'.htmlentities($alt).'"><br>';
+	echo '<img src="'.htmlentities(phpThumbURL('src='.urlencode($imgdir.@$_REQUEST['dir'].'/'.$_REQUEST['pic']).'&w='.$displaysize.'&h='.$displaysize, $thumb)).'" border="0" alt="'.htmlentities($alt, ENT_QUOTES).'"><br>';
 	echo '<div align="center">'.htmlentities(@$CAPTIONS[$_REQUEST['pic']]).'</div>';
 
 } else {
 
-	$currentdir = realpath($docroot.'/'.$basedir.@$_REQUEST['dir']);
+	$currentdir = realpath($docroot.'/'.$imgdir.@$_REQUEST['dir']);
 	if (!preg_match('#^'.preg_quote($dirlimit).'#', $currentdir)) {
 		echo 'Cannot browse to "'.htmlentities($currentdir).'"<br>';
 	} elseif ($dh = @opendir($currentdir)) {
@@ -82,19 +85,19 @@
 				$alt = (!empty($CAPTIONS[$file]) ? $CAPTIONS[$file] : $file);
 				echo '<table style="float: left;">'.(!empty($CAPTIONS[$file]) ? '<caption align="bottom">'.htmlentities($CAPTIONS[$file]).'</caption>' : '').'<tbody><tr><td>';
 				if ($use_popup) {
-					echo '<a title="'.htmlentities($alt, ENT_QUOTES).'" href="#" onClick="window.open(\''.$popup.'?src='.htmlentities($basedir.@$_REQUEST['dir'].'/'.$file.'&w='.$displaysize.'&h='.$displaysize.'&title='.urlencode(@$CAPTIONS[$file] ? $CAPTIONS[$file] : $file)).'\', \'showpic\', \'width='.$displaysize.',height='.$displaysize.',resizable=no,status=no,menubar=no,toolbar=no,scrollbars=no\'); return false;">';
+					echo '<a title="'.htmlentities($alt, ENT_QUOTES).'" href="#" onClick="window.open(\''.$popup.'?src='.htmlentities($imgdir.@$_REQUEST['dir'].'/'.$file.'&w='.$displaysize.'&h='.$displaysize.'&title='.urlencode(@$CAPTIONS[$file] ? $CAPTIONS[$file] : $file)).'\', \'showpic\', \'width='.$displaysize.',height='.$displaysize.',resizable=no,status=no,menubar=no,toolbar=no,scrollbars=no\'); return false;">';
 				} else {
 					echo '<a title="'.htmlentities($alt, ENT_QUOTES).'" href="'.$_SERVER['PHP_SELF'].'?dir='.htmlentities(urlencode(@$_REQUEST['dir']).'&pic='.urlencode($file)).'">';
 				}
-				echo '<img src="'.$thumb.'?src='.htmlentities(urlencode($basedir.@$_REQUEST['dir'].'/'.$file).'&zc=1&w='.$thumbnailsize.'&h='.$thumbnailsize).'" border="1" width="'.$thumbnailsize.'" height="'.$thumbnailsize.'" alt="'.htmlentities($alt).'">';
+				echo '<img src="'.htmlentities(phpThumbURL('src='.urlencode($imgdir.@$_REQUEST['dir'].'/'.$file).'&zc=1&w='.$thumbnailsize.'&h='.$thumbnailsize, $thumb)).'" border="1" width="'.$thumbnailsize.'" height="'.$thumbnailsize.'" alt="'.htmlentities($alt, ENT_QUOTES).'">';
 				echo '</a></td></tr></tbody></table>';
 			}
 			echo '<br clear="all">';
 		} else {
-			echo '<i>No pictures in "'.htmlentities(str_replace(realpath($docroot), '', realpath($docroot.'/'.$basedir.@$_REQUEST['dir']))).'"</i>';
+			echo '<i>No pictures in "'.htmlentities(str_replace(realpath($docroot), '', realpath($docroot.'/'.$imgdir.@$_REQUEST['dir']))).'"</i>';
 		}
 	} else {
-		echo 'failed to open "'.htmlentities($basedir).'"';
+		echo 'failed to open "'.htmlentities($currentdir).'"';
 	}
 
 }
diff --git a/demo/phpThumb.demo.showpic.php b/demo/phpThumb.demo.showpic.php
index a8d9a9b..c4899c5 100644
--- a/demo/phpThumb.demo.showpic.php
+++ b/demo/phpThumb.demo.showpic.php
@@ -31,6 +31,7 @@
 die('For security reasons, this demo is disabled by default. Please comment out line '.__LINE__.' in '.basename(__FILE__));
 
 $phpThumbLocation = '../phpThumb.php';
+require_once('../phpThumb.config.php');
 
 echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 echo '<html><head>';
@@ -76,7 +77,6 @@ function CrossBrowserResizeInnerWindowTo(newWidth, newHeight) {
 <script type="text/javascript" src="javascript_api.js"></script>
 
 <?php
-require_once('../phpThumb.config.php');
 $allowedGETparameters = array('src','new','w','h','wp','hp','wl','hl','ws','hs','f','q','sx','sy','sw','sh','zc','bc','bg','bgt','fltr','xto','ra','ar','aoe','far','iar','maxb','hash','md5s','sfn','dpi','sia');
 
 $additionalparameters = array();
diff --git a/phpthumb.class.php b/phpthumb.class.php
index 00f08be..48a6c26 100644
--- a/phpthumb.class.php
+++ b/phpthumb.class.php
@@ -215,7 +215,7 @@ class phpthumb {
 	var $issafemode       = null;
 	var $php_memory_limit = null;
 
-	var $phpthumb_version = '1.7.14-201607281445';
+	var $phpthumb_version = '1.7.14-201608100902';
 
 	//////////////////////////////////////////////////////////////////////
 
@@ -1679,7 +1679,7 @@ function ImageMagickThumbnailToGD() {
 
 				if (!is_null($this->dpi) && $this->ImageMagickSwitchAvailable('density')) {
 					// for vector source formats only (WMF, PDF, etc)
-					//$commandline .= ' -flatten';
+					$commandline .= ' -flatten';
 					$commandline .= ' -density '.phpthumb_functions::escapeshellarg_replacement($this->dpi);
 				}
 				ob_start();