diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 404e5d48a..bc0c062c9 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -61,7 +61,7 @@
 			$this->filename = $tpl_filename;
 			$this->file = $tpl_file;
 
-			$this->web_path = $this->xe_path.'/'.preg_replace('@^'.preg_quote(_XE_PATH_,'@').'|\./@','',$this->path);
+			$this->web_path = $this->xe_path.'/'.ltrim(preg_replace('@^'.preg_quote(_XE_PATH_,'@').'|\./@','',$this->path),'/');
 
 			// get compiled file name
 			$hash = md5($this->file . __ZBXE_VERSION__);
@@ -154,7 +154,7 @@
 			}
 
 			// replace value of src in img/input/script tag
-			$buff = preg_replace_callback('/<(img|input|script)([^>]*)src="([^"]*?)"/is', array($this, '_replacePath'), $buff);
+			$buff = preg_replace_callback('/(<(?:img|input|script)(?:->|<!--.+?-->|[^<>])*)\ssrc="(?!https?:\/\/|[\/\{])(.+?)"/is', array($this, '_replacePath'), $buff);
 
 			// replace loop and cond template syntax
 			$buff = $this->_parseInline($buff);
@@ -263,25 +263,18 @@
          **/
 		function _replacePath($matches)
 		{
-			preg_match_all('/src="([^"]*?)"/is', $matches[0], $m);
-			for($i=0,$c=count($m[0]);$i<$c;$i++) {
-				$path = trim($m[1][$i]);
-				if(substr($path,0,1)=='/' || substr($path,0,1)=='{' || strpos($path,'://')!==false) continue;
-				if(substr($path,0,2)=='./') $path = substr($path,2);
-				$target = $this->web_path.$path;
-				while(strpos($target,'/../')!==false)
-				{
-					$target = preg_replace('/\/([^\/]+)\/\.\.\//','/',$target);
-				}
-				$target = str_replace('/./','/',$target);
-				$matches[0] = str_replace($m[0][$i], 'src="'.$target.'"', $matches[0]);
-			}
-			return $matches[0];
+			$src = preg_replace('@^(\./)+@', '', trim($matches[2]));
+			$src = $this->web_path.$src;
+			$src = str_replace('/./', '/', $src);
+
+			while(($tmp=preg_replace('@[^/]+/\.\./@', '', $src))!==$src) $src = $tmp;
+
+			return "{$matches[1]} src=\"{$src}\"";
 		}
 
 		function _parseInline($buff)
 		{
-			if(preg_match_all('/<([a-zA-Z0-9]+)(?:->|<!--.+?-->|[^<>-]*)*?(?:[ \|]cond| loop)="/s', $buff, $matches) === false) return $buff;
+			if(preg_match_all('/<([a-zA-Z0-9]+)(?:->|<!--.+?-->|[^<>])*?(?:[ \|]cond| loop)="/s', $buff, $matches) === false) return $buff;
 
 			$tags = array_unique($matches[1]);
 			$tags = implode('|',array_unique($matches[1]));
@@ -396,10 +389,10 @@
 					if($cmd == 'import') $cmd = 'load';
 				}
 
-				if(!preg_match('@^\.?/@',$attr['target'])) $attr['target'] = './'.$attr['target'];
-
 				$isRemoteFile = !!preg_match('@^https?://@i', $attr['target']);
 
+				if(!$isRemoteFile && !preg_match('@^\.?/@',$attr['target'])) $attr['target'] = './'.$attr['target'];
+
 				$metafile = '';
 				$pathinfo = pathinfo($attr['target']);
 				$relativeDir = $this->_getRelativeDir($pathinfo['dirname']);
@@ -419,9 +412,9 @@
 						break;
 					case 'js':
 						if($cmd == 'unload') {
-							$result = " Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
+							$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
 						} else {
-							$result = " \$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}','{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');Context::loadFile(\$__tmp);unset(\$__tmp);";
+							$result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}','{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');Context::loadFile(\$__tmp);unset(\$__tmp);";
 						}
 						break;
 					case 'css':
diff --git a/tests/classes/template/TemplateHandlerTest.class.php b/tests/classes/template/TemplateHandlerTest.class.php
index 11fe6464f..7b104f335 100644
--- a/tests/classes/template/TemplateHandlerTest.class.php
+++ b/tests/classes/template/TemplateHandlerTest.class.php
@@ -113,11 +113,41 @@ class TemplateHandlerTest extends PHPUnit_Framework_TestCase
 				'<dummy_before /><!--// this is a comment--><dummy_after />',
 				'<dummy_before /><dummy_after />'
 			),
+			// self-closing tag
+			array(
+				'<meta charset="utf-8" cond="$foo">',
+				'<?php if($__Context->foo){ ?><meta charset="utf-8"><?php } ?>'
+			),
+			// relative path
+			array(
+				'<img src="http://naver.com/naver.gif"><input type="image" src="../local.gif" />',
+				'<img src="http://naver.com/naver.gif"><input type="image" src="/xe/tests/classes/local.gif" />'
+			),
+			// relative path
+			array(
+				'<img src="http://naver.com/naver.gif"><input type="image" src="../../dir/local.gif" />',
+				'<img src="http://naver.com/naver.gif"><input type="image" src="/xe/tests/dir/local.gif" />'
+			),
 			// error case
 			array(
 				'<a href="{$layout_info->index_url}" cond="$layout_info->logo_image"><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /></a>',
 				'<?php if($__Context->layout_info->logo_image){ ?><a href="<?php echo $__Context->layout_info->index_url ?>"><img src="<?php echo $__Context->layout_info->logo_image ?>" alt="logo" border="0" class="iePngFix" /></a><?php } ?>'
 			),
+			// issue 103
+			array(
+				'<load target="http://aaa.com/aaa.js" />',
+				'<?php $__tmp=array(\'http://aaa.com/aaa.js\',\'\',\'\',\'\',\'\',\'\',\'\');Context::loadFile($__tmp);unset($__tmp); ?>'
+			),
+			// issue 135
+			array(
+				'<block loop="$_m_list_all=>$key,$val"><p>{$key}</p><div>Loop block {$val}</div></block>',
+				'<?php if($__Context->_m_list_all&&count($__Context->_m_list_all))foreach($__Context->_m_list_all as $__Context->key=>$__Context->val){ ?><p><?php echo $__Context->key ?></p><div>Loop block <?php echo $__Context->val ?></div><?php } ?>'
+			),
+			// issue 136
+			array(
+				'<br cond="$var==\'foo\'" />bar',
+				'<?php if($__Context->var==\'foo\'){ ?><br /><?php } ?>bar'
+			),
 		);
 	}