diff --git a/example.php b/examples/example.php
similarity index 91%
rename from example.php
rename to examples/example.php
index 1ea3fa1..53d98e4 100644
--- a/example.php
+++ b/examples/example.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'klein.php';
+require_once '../klein.php';
 
 function title($x) {
     return ucfirst($x);
diff --git a/example2.php b/examples/example2.php
similarity index 96%
rename from example2.php
rename to examples/example2.php
index fe815a7..326f5e3 100644
--- a/example2.php
+++ b/examples/example2.php
@@ -27,7 +27,7 @@ $data = array (
 );
 
 
-require_once 'klein.php';
+require_once '../klein.php';
 
 $tpl = new Klein();
 $tpl->compile('template2.html');
diff --git a/example3.php b/examples/example3.php
similarity index 83%
rename from example3.php
rename to examples/example3.php
index fba906a..2189a2e 100644
--- a/example3.php
+++ b/examples/example3.php
@@ -2,8 +2,7 @@
 
 $data = array('phedor', 'andrey');
 
-
-require_once 'klein.php';
+require_once '../klein.php';
 
 $tpl = new Klein();
 $tpl->compile('template3.html');
diff --git a/tempalte.html b/examples/tempalte.html
similarity index 100%
rename from tempalte.html
rename to examples/tempalte.html
diff --git a/template2.html b/examples/template2.html
similarity index 100%
rename from template2.html
rename to examples/template2.html
diff --git a/template3.html b/examples/template3.html
similarity index 96%
rename from template3.html
rename to examples/template3.html
index f5fa1f2..203fede 100644
--- a/template3.html
+++ b/examples/template3.html
@@ -1,8 +1,8 @@
-<div>
 {% macro hello(name) %}
     <em>hello, {{ name }} {{! name }}<em>
 {% endmacro %}
 
+<div>
 {% for name in names %}
     {{ hello(name) }}
 {% endfor %}
diff --git a/klein.php b/klein.php
index bd3d242..6ca1a72 100644
--- a/klein.php
+++ b/klein.php
@@ -11,7 +11,8 @@ class Klein {
                 function ($x) use ($result) {
                     $code = "<?php " . preg_replace_callback("/#(\d+)(s?)/", function ($s) use($x) {
                         $pref = $s[2] == 's' ? '$' : '';
-                        return implode(", ", array_map(function ($s) use($pref) { return $pref.preg_replace("/\.\s*(\w+)/", "['$1']", $s); }, preg_split("/\s*,\s*/", $x[$s[1]])));
+                        return implode(", ", array_map(function ($s) use($pref) { 
+                                return $pref.preg_replace("/\.\s*(\w+)/", "['$1']", $s); }, preg_split("/\s*,\s*/", $x[$s[1]])));
                     }, $result) . " ?>";
                     return ($x[0][2] == '!') ? "<!-- $code -->" : $code;
                 }];