From 859050596136b1e195bc055931f3190abecae452 Mon Sep 17 00:00:00 2001
From: Maxime Helias <maximehelias16@gmail.com>
Date: Mon, 26 Mar 2018 22:40:42 +0200
Subject: [PATCH] Migration PHP 5.x to PHP 7.x

---
 .editorconfig                                 |   2 +-
 .gitattributes                                |   2 +-
 .travis.yml                                   |   1 -
 composer.json                                 |  14 +-
 ....Exceptions.InvalidParameterException.html |  22 +-
 ...minatim.Exceptions.NominatimException.html |  33 +-
 docs/classes/maxh.Nominatim.Lookup.html       |  52 +-
 docs/classes/maxh.Nominatim.Nominatim.html    |  34 +-
 docs/classes/maxh.Nominatim.Query.html        |  57 +-
 .../maxh.Nominatim.QueryInterface.html        |  20 +-
 docs/classes/maxh.Nominatim.QueryTrait.html   | 689 ------------------
 docs/classes/maxh.Nominatim.Reverse.html      |  56 +-
 docs/classes/maxh.Nominatim.Search.html       |  60 +-
 .../Exceptions.InvalidParameterException.html |  33 +-
 docs/files/Exceptions.NominatimException.html |  33 +-
 .../InvalidParameterException.php.txt         |   3 +
 .../Exceptions/NominatimException.php.txt     |  11 +-
 docs/files/Lookup.html                        |  20 +-
 docs/files/Lookup.php.txt                     |   7 +-
 docs/files/Nominatim.html                     |  20 +-
 docs/files/Nominatim.php.txt                  |  54 +-
 docs/files/Query.html                         |  20 +-
 docs/files/Query.php.txt                      |  52 +-
 docs/files/QueryInterface.html                |  22 +-
 docs/files/QueryInterface.php.txt             |  12 +-
 docs/files/QueryTrait.html                    | 326 ---------
 docs/files/QueryTrait.php.txt                 |  98 ---
 docs/files/Reverse.html                       |  20 +-
 docs/files/Reverse.php.txt                    |  12 +-
 docs/files/Search.html                        |  20 +-
 docs/files/Search.php.txt                     |  32 +-
 docs/font/FontAwesome.otf                     | Bin 75186 -> 75188 bytes
 docs/font/fontawesome-webfont.ttf             | Bin 141537 -> 141564 bytes
 docs/font/fontawesome-webfont.woff            | Bin 83759 -> 83760 bytes
 docs/graphs/class.html                        |   2 +-
 docs/graphs/classes.svg                       | 164 +++--
 docs/images/apple-touch-icon-114x114.png      | Bin 28336 -> 28338 bytes
 docs/images/apple-touch-icon-72x72.png        | Bin 12750 -> 12751 bytes
 docs/images/apple-touch-icon.png              | Bin 8357 -> 8358 bytes
 docs/images/hierarchy-item.png                | Bin 235 -> 236 bytes
 docs/images/icon-class-13x13.png              | Bin 427 -> 428 bytes
 docs/images/icon-interface-13x13.png          | Bin 307 -> 308 bytes
 docs/images/icon-trait-13x13.png              | Bin 339 -> 340 bytes
 docs/images/iviewer/iviewer.rotate_left.png   | Bin 1492 -> 1493 bytes
 docs/images/iviewer/iviewer.rotate_right.png  | Bin 1480 -> 1482 bytes
 docs/images/iviewer/iviewer.zoom_fit.png      | Bin 1251 -> 1252 bytes
 docs/images/iviewer/iviewer.zoom_in.png       | Bin 1419 -> 1420 bytes
 docs/images/iviewer/iviewer.zoom_out.png      | Bin 1415 -> 1416 bytes
 docs/images/iviewer/iviewer.zoom_zero.png     | Bin 1090 -> 1091 bytes
 docs/index.html                               |  18 +-
 docs/namespaces/default.html                  |  18 +-
 .../namespaces/maxh.Nominatim.Exceptions.html |  18 +-
 docs/namespaces/maxh.Nominatim.html           |  18 +-
 docs/namespaces/maxh.html                     |  18 +-
 ...-file_f5f6b84906e89e213f2429162986526b.dat | Bin 45607 -> 47655 bytes
 ...-file_d09f0f1f8734cca72644ca8f179729f5.dat | Bin 7547 -> 7570 bytes
 ...file_fc97c9c8e82b0a7635ba87870608eb18.dat} | Bin 4346 -> 4780 bytes
 ...-file_3f6880af1291c36c4944ed54be016677.dat | Bin 0 -> 16790 bytes
 ...-file_21af159c905d0493a0e92eed8ee6937b.dat | Bin 31993 -> 32495 bytes
 ...-file_2c03d98fe84f7883648dbd918f694543.dat | Bin 38842 -> 39019 bytes
 ...-file_c24bbd97c22a0e2877aadb465d8290c8.dat | Bin 19438 -> 19502 bytes
 ...-file_8ddf77c5157272b7bd4b14070db0fde7.dat | Bin 16204 -> 0 bytes
 ...-file_821e8e95065b6bbe12e3c72dcdfa6673.dat | Bin 12019 -> 12048 bytes
 docs/reports/deprecated.html                  |   2 +-
 docs/reports/errors.html                      |   2 +-
 docs/reports/markers.html                     |   2 +-
 examples/LookupExample.php                    |  31 +-
 examples/ReverseExample.php                   |  26 +-
 examples/SearchExample.php                    |  36 +-
 src/Exceptions/InvalidParameterException.php  |   3 +
 src/Exceptions/NominatimException.php         |  11 +-
 src/Lookup.php                                |   7 +-
 src/Nominatim.php                             |  54 +-
 src/Query.php                                 |  52 +-
 src/QueryInterface.php                        |  12 +-
 src/Reverse.php                               |  12 +-
 src/Search.php                                |  32 +-
 tests/LookupTest.php                          |  21 +-
 tests/NominatimTest.php                       |   9 +-
 tests/ReverseTest.php                         |  18 +-
 tests/SearchTest.php                          |  18 +-
 81 files changed, 729 insertions(+), 1712 deletions(-)
 delete mode 100644 docs/classes/maxh.Nominatim.QueryTrait.html
 delete mode 100644 docs/files/QueryTrait.html
 delete mode 100644 docs/files/QueryTrait.php.txt
 rename docs/{phpdoc-cache-da/phpdoc-cache-file_c6aeec193347e8e093efabca75accd2e.dat => phpdoc-cache-5c/phpdoc-cache-file_fc97c9c8e82b0a7635ba87870608eb18.dat} (70%)
 create mode 100644 docs/phpdoc-cache-7b/phpdoc-cache-file_3f6880af1291c36c4944ed54be016677.dat
 delete mode 100644 docs/phpdoc-cache-d3/phpdoc-cache-file_8ddf77c5157272b7bd4b14070db0fde7.dat

diff --git a/.editorconfig b/.editorconfig
index a40f024..a29a2cf 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,7 +7,7 @@ root = true
 charset = utf-8
 
 # Unix-style newlines with a newline ending every file
-[*]
+[!*.{otf,ttf,woff,png}]
 end_of_line = lf
 insert_final_newline = true
 
diff --git a/.gitattributes b/.gitattributes
index e8f63af..a2d0bec 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,4 +14,4 @@
 /tests              export-ignore
 
 # End line
-* text eol=lf
+\!*.{otf,ttf,woff,png} text eol=lf
diff --git a/.travis.yml b/.travis.yml
index 48279e2..d045990 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ env:
     - COMPOSER_DISABLE_XDEBUG_WARN=1
 
 php:
-    - 5.6
     - 7.0
     - 7.1
     - 7.2
diff --git a/composer.json b/composer.json
index 57a4588..2e8b5dc 100644
--- a/composer.json
+++ b/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require": {
-        "php": ">=5.5.0",
-        "guzzlehttp/guzzle": "^6.0"
+        "php": ">=7.0",
+        "guzzlehttp/guzzle": "dev-master"
     },
     "require-dev": {
         "phpunit/phpunit": "5.7.*",
-        "squizlabs/php_codesniffer": "@dev",
+        "squizlabs/php_codesniffer": "dev-master",
         "phpro/grumphp": "^0.12.0||0.9.*"
     },
     "autoload": {
@@ -31,9 +31,9 @@
         }
     },
     "scripts": {
-        "test": "vendor\\bin\\phpunit",
-        "check-style": "vendor\\bin\\phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
-        "fix-style": "vendor\\bin\\phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
-        "doc": "phpdoc -d src\\ -t docs\\"
+        "test": "vendor/bin/phpunit",
+        "check-style": "vendor/bin/phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
+        "fix-style": "vendor/bin/phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
+        "doc": "phpdoc -d src/ -t docs/"
     }
 }
diff --git a/docs/classes/maxh.Nominatim.Exceptions.InvalidParameterException.html b/docs/classes/maxh.Nominatim.Exceptions.InvalidParameterException.html
index f6b9789..2f61d3f 100644
--- a/docs/classes/maxh.Nominatim.Exceptions.InvalidParameterException.html
+++ b/docs/classes/maxh.Nominatim.Exceptions.InvalidParameterException.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2031783678"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1597574722"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2031783678" class="accordion-body collapse in">
+            <div id="namespace-1597574722" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-462031428"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2072921793"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-462031428" class="accordion-body collapse ">
+            <div id="namespace-2072921793" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-582360848"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2025259895"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-582360848" class="accordion-body collapse ">
+            <div id="namespace-2025259895" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-989794078"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-68463740"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-989794078" class="accordion-body collapse ">
+            <div id="namespace-68463740" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -287,7 +287,7 @@ <h2>Summary</h2>
                     
                     <dl>
                         <dt>File</dt>
-                            <dd><a href="../files/Exceptions.InvalidParameterException.html"><div class="path-wrapper">Exceptions\InvalidParameterException.php</div></a></dd>
+                            <dd><a href="../files/Exceptions.InvalidParameterException.html"><div class="path-wrapper">Exceptions/InvalidParameterException.php</div></a></dd>
                                                 <dt>Package</dt>
                             <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
@@ -327,7 +327,7 @@ <h2>Tags</h2>
             <h3 id="source-view-label">InvalidParameterException.php</h3>
         </div>
         <div class="modal-body">
-            <pre data-src="../files/Exceptions\InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
+            <pre data-src="../files/Exceptions/InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
         </div>
     </div>
 
@@ -368,7 +368,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.Exceptions.NominatimException.html b/docs/classes/maxh.Nominatim.Exceptions.NominatimException.html
index 28f451b..7603267 100644
--- a/docs/classes/maxh.Nominatim.Exceptions.NominatimException.html
+++ b/docs/classes/maxh.Nominatim.Exceptions.NominatimException.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-743962778"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1173300529"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-743962778" class="accordion-body collapse in">
+            <div id="namespace-1173300529" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1969366245"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-969570493"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1969366245" class="accordion-body collapse ">
+            <div id="namespace-969570493" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1287626162"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1779959186"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1287626162" class="accordion-body collapse ">
+            <div id="namespace-1779959186" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-387998253"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-253047147"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-387998253" class="accordion-body collapse ">
+            <div id="namespace-253047147" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -290,7 +290,7 @@ <h2>Summary</h2>
                     
                     <dl>
                         <dt>File</dt>
-                            <dd><a href="../files/Exceptions.NominatimException.html"><div class="path-wrapper">Exceptions\NominatimException.php</div></a></dd>
+                            <dd><a href="../files/Exceptions.NominatimException.html"><div class="path-wrapper">Exceptions/NominatimException.php</div></a></dd>
                                                 <dt>Package</dt>
                             <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
@@ -389,7 +389,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">__construct()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">__construct(string  <span class="argument">$message</span>, \Psr\Http\Message\RequestInterface  <span class="argument">$request</span>, \Psr\Http\Message\ResponseInterface|null  <span class="argument">$response = null</span>, \Exception|null  <span class="argument">$previous = null</span>) </pre>
+                <pre class="signature" style="margin-right: 54px;">__construct(string  <span class="argument">$message</span>, \Psr\Http\Message\RequestInterface  <span class="argument">$request = null</span>, \Psr\Http\Message\ResponseInterface|null  <span class="argument">$response = null</span>, \Exception|null  <span class="argument">$previous = null</span>) </pre>
                 <p><em>Constructor</em></p>
                 
 
@@ -438,14 +438,14 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">getRequest()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">getRequest() : \GuzzleHttp\Psr7\Request</pre>
+                <pre class="signature" style="margin-right: 54px;">getRequest() : \Psr\Http\Message\RequestInterface</pre>
                 <p><em>Return the Request</em></p>
                 
 
                 
                 
                                     <h4>Returns</h4>
-                    \GuzzleHttp\Psr7\Request
+                    \Psr\Http\Message\RequestInterface
                                     				
                             </article>
         </div>
@@ -466,15 +466,14 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">getResponse()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">getResponse() : \GuzzleHttp\Psr7\Response</pre>
+                <pre class="signature" style="margin-right: 54px;">getResponse() : \GuzzleHttp\Promise\PromiseInterface|\Psr\Http\Message\ResponseInterface</pre>
                 <p><em>Return the Response</em></p>
                 
 
                 
                 
                                     <h4>Returns</h4>
-                    \GuzzleHttp\Psr7\Response
-                                            &mdash; <p>[description]</p>
+                    \GuzzleHttp\Promise\PromiseInterface|\Psr\Http\Message\ResponseInterface
                                     				
                             </article>
         </div>
@@ -498,7 +497,7 @@ <h2>Tags</h2>
             <h3 id="source-view-label">NominatimException.php</h3>
         </div>
         <div class="modal-body">
-            <pre data-src="../files/Exceptions\NominatimException.php.txt" class="language-php line-numbers"></pre>
+            <pre data-src="../files/Exceptions/NominatimException.php.txt" class="language-php line-numbers"></pre>
         </div>
     </div>
 
@@ -539,7 +538,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.Lookup.html b/docs/classes/maxh.Nominatim.Lookup.html
index 6113880..cd7e4b1 100644
--- a/docs/classes/maxh.Nominatim.Lookup.html
+++ b/docs/classes/maxh.Nominatim.Lookup.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1994625635"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1069331718"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1994625635" class="accordion-body collapse in">
+            <div id="namespace-1069331718" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1163611573"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-313879340"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1163611573" class="accordion-body collapse ">
+            <div id="namespace-313879340" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1757031542"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1285088078"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1757031542" class="accordion-body collapse ">
+            <div id="namespace-1285088078" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-305035806"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-226166937"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-305035806" class="accordion-body collapse ">
+            <div id="namespace-226166937" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -279,7 +279,7 @@ <h2>Summary</h2>
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_path" class="">$path</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_query" class="">$query</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_format" class="">$format</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_accepteFormat" class="">$accepteFormat</a><br />
+                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_acceptedFormat" class="">$acceptedFormat</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_polygon" class="">$polygon</a><br />
                                                             </section>
                             <section class="span4">
@@ -306,7 +306,7 @@ <h2>Summary</h2>
                         <dt>File</dt>
                             <dd><a href="../files/Lookup.html"><div class="path-wrapper">Lookup.php</div></a></dd>
                                                 <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
                             <dd class="hierarchy">
                                                                                                                                                                                                                                                                                                 
@@ -417,10 +417,10 @@ <h2>Tags</h2>
 
                                     <div class="row-fluid">
         <div class="span8 content class">
-            <a id="property_accepteFormat" name="property_accepteFormat" class="anchor"></a>
+            <a id="property_acceptedFormat" name="property_acceptedFormat" class="anchor"></a>
             <article class="property">
-                <h3 class="protected ">$accepteFormat</h3>
-                <pre class="signature">$accepteFormat : array</pre>
+                <h3 class="protected ">$acceptedFormat</h3>
+                <pre class="signature">$acceptedFormat : array</pre>
                 <p><em>Output format accepted</em></p>
                 
 
@@ -514,7 +514,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">format()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Format returning by the request.</em></p>
                 
 
@@ -534,7 +534,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -557,7 +557,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">language()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Preferred language order for showing search results, overrides the value
 specified in the &quot;Accept-Language&quot; HTTP header. Either uses standard
 rfc2616 accept-language string or a simple comma separated list of
@@ -577,7 +577,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -600,7 +600,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">addressDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a breakdown of the address into elements.</em></p>
                 
 
@@ -615,7 +615,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -638,7 +638,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">email()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>If you are making large numbers of request please include a valid email address or alternatively include your
 email address as part of the User-Agent string. This information will be kept confidential and only used to
 contact you in the event of a problem, see Usage Policy for more details.</em></p>
@@ -655,7 +655,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -717,7 +717,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">extraTags()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include additional information in the result if available</em></p>
                 
 
@@ -732,7 +732,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -755,7 +755,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">nameDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a list of alternative names in the results.</em></p>
                 <p>These may include language variants, references, operator and brand.</p>
 
@@ -770,7 +770,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -1105,7 +1105,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.Nominatim.html b/docs/classes/maxh.Nominatim.Nominatim.html
index 22402dc..c17b838 100644
--- a/docs/classes/maxh.Nominatim.Nominatim.html
+++ b/docs/classes/maxh.Nominatim.Nominatim.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1424910245"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-616690015"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1424910245" class="accordion-body collapse in">
+            <div id="namespace-616690015" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1442354960"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-626799202"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1442354960" class="accordion-body collapse ">
+            <div id="namespace-626799202" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-634993298"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1121776237"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-634993298" class="accordion-body collapse ">
+            <div id="namespace-1121776237" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1951295541"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-738792493"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1951295541" class="accordion-body collapse ">
+            <div id="namespace-738792493" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -297,7 +297,7 @@ <h2>Summary</h2>
                         <dt>File</dt>
                             <dd><a href="../files/Nominatim.html"><div class="path-wrapper">Nominatim.php</div></a></dd>
                                                 <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
                             <dd class="hierarchy">
                                                                                                                                                                     <div class="namespace-wrapper">\maxh\Nominatim\Nominatim</div>
@@ -306,7 +306,9 @@ <h2>Summary</h2>
                         
                         
                         
-                        
+                                                                            <dt>See also</dt>
+                                                                                        <dd><a href="http://wiki.openstreetmap.org/wiki/Nominatim"><span class="namespace-wrapper">http://wiki.openstreetmap.org/wiki/Nominatim</span></a></dd>
+                                                    
                                                                         </dl>
                     <h2>Tags</h2>
                     <table class="table table-condensed">
@@ -478,7 +480,7 @@ <h4>Parameters</h4>
                 
                                     <h4>Throws</h4>
                     <dl>
-                                                    <dt>\maxh\Nominatim\Exceptions\InvalidParameterException</dt>
+                                                    <dt>\maxh\Nominatim\Exceptions\NominatimException</dt>
                             <dd></dd>
                                                                     </dl>
                 
@@ -531,7 +533,7 @@ <h2>Tags</h2>
                 <h3 class="public ">newReverse()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
                 <pre class="signature" style="margin-right: 54px;">newReverse() : \maxh\Nominatim\Reverse</pre>
-                <p><em>Returns a new search object based on the base reverse.</em></p>
+                <p><em>Returns a new reverse object based on the base reverse.</em></p>
                 
 
                 
@@ -559,7 +561,7 @@ <h2>Tags</h2>
                 <h3 class="public ">newLookup()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
                 <pre class="signature" style="margin-right: 54px;">newLookup() : \maxh\Nominatim\Lookup</pre>
-                <p><em>Returns a new search object based on the base lookup.</em></p>
+                <p><em>Returns a new lookup object based on the base lookup.</em></p>
                 
 
                 
@@ -586,7 +588,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">find()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">find(\maxh\Nominatim\QueryInterface  <span class="argument">$nRequest</span>) : array</pre>
+                <pre class="signature" style="margin-right: 54px;">find(\maxh\Nominatim\QueryInterface  <span class="argument">$nRequest</span>) : array|\SimpleXMLElement</pre>
                 <p><em>Runs the query and returns the result set from Nominatim.</em></p>
                 
 
@@ -608,7 +610,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    array
+                    array|\SimpleXMLElement
                                             &mdash; <p>The decoded data returned from Nominatim</p>
                                     				
                             </article>
@@ -753,7 +755,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.Query.html b/docs/classes/maxh.Nominatim.Query.html
index 08e84bc..4b5a8d1 100644
--- a/docs/classes/maxh.Nominatim.Query.html
+++ b/docs/classes/maxh.Nominatim.Query.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-648811491"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1033083205"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-648811491" class="accordion-body collapse in">
+            <div id="namespace-1033083205" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1479836015"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-635467392"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1479836015" class="accordion-body collapse ">
+            <div id="namespace-635467392" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-61748359"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1313997141"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-61748359" class="accordion-body collapse ">
+            <div id="namespace-1313997141" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-879247453"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-177100874"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-879247453" class="accordion-body collapse ">
+            <div id="namespace-177100874" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -278,7 +278,7 @@ <h2>Summary</h2>
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_path" class="">$path</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_query" class="">$query</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_format" class="">$format</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_accepteFormat" class="">$accepteFormat</a><br />
+                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_acceptedFormat" class="">$acceptedFormat</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_polygon" class="">$polygon</a><br />
                                                             </section>
                             <section class="span4">
@@ -299,13 +299,14 @@ <h2>Summary</h2>
                     </section>
                 </div>
                 <aside class="span4 detailsbar">
+                                            <span class="label label-info">abstract</span>
                                         
                     
                     <dl>
                         <dt>File</dt>
                             <dd><a href="../files/Query.html"><div class="path-wrapper">Query.php</div></a></dd>
                                                 <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
                             <dd class="hierarchy">
                                                                                                                                                                     <div class="namespace-wrapper">\maxh\Nominatim\Query</div>
@@ -408,10 +409,10 @@ <h2>Tags</h2>
 
                                     <div class="row-fluid">
         <div class="span8 content class">
-            <a id="property_accepteFormat" name="property_accepteFormat" class="anchor"></a>
+            <a id="property_acceptedFormat" name="property_acceptedFormat" class="anchor"></a>
             <article class="property">
-                <h3 class="protected ">$accepteFormat</h3>
-                <pre class="signature">$accepteFormat : array</pre>
+                <h3 class="protected ">$acceptedFormat</h3>
+                <pre class="signature">$acceptedFormat : array</pre>
                 <p><em>Output format accepted</em></p>
                 
 
@@ -501,7 +502,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">format()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Format returning by the request.</em></p>
                 
 
@@ -521,7 +522,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -542,7 +543,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">language()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Preferred language order for showing search results, overrides the value
 specified in the &quot;Accept-Language&quot; HTTP header. Either uses standard
 rfc2616 accept-language string or a simple comma separated list of
@@ -562,7 +563,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -583,7 +584,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">addressDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a breakdown of the address into elements.</em></p>
                 
 
@@ -598,7 +599,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -619,7 +620,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">email()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>If you are making large numbers of request please include a valid email address or alternatively include your
 email address as part of the User-Agent string. This information will be kept confidential and only used to
 contact you in the event of a problem, see Usage Policy for more details.</em></p>
@@ -636,7 +637,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -657,7 +658,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">polygon()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">polygon(string  <span class="argument">$polygon</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">polygon(string  <span class="argument">$polygon</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Query</pre>
                 <p><em>Output format for the geometry of results</em></p>
                 
 
@@ -677,7 +678,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
                                     				
                             </article>
         </div>
@@ -698,7 +699,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">extraTags()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include additional information in the result if available</em></p>
                 
 
@@ -713,7 +714,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -734,7 +735,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">nameDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a list of alternative names in the results.</em></p>
                 <p>These may include language variants, references, operator and brand.</p>
 
@@ -749,7 +750,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -1032,7 +1033,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.QueryInterface.html b/docs/classes/maxh.Nominatim.QueryInterface.html
index d3800f1..df5fc80 100644
--- a/docs/classes/maxh.Nominatim.QueryInterface.html
+++ b/docs/classes/maxh.Nominatim.QueryInterface.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2136752926"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2058228558"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2136752926" class="accordion-body collapse in">
+            <div id="namespace-2058228558" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2134715873"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1944747500"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-2134715873" class="accordion-body collapse ">
+            <div id="namespace-1944747500" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1654479857"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1672200265"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1654479857" class="accordion-body collapse ">
+            <div id="namespace-1672200265" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1729720466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1620023355"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1729720466" class="accordion-body collapse ">
+            <div id="namespace-1620023355" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -277,7 +277,7 @@ <h2>Summary</h2>
                                 <a href="../files/QueryInterface.html"><div class="path-wrapper">QueryInterface.php</div></a>
                             </dd>
                                                 <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                                                 
                                             </dl>
                     <h2>Tags</h2>
@@ -433,7 +433,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.QueryTrait.html b/docs/classes/maxh.Nominatim.QueryTrait.html
deleted file mode 100644
index 88a57d9..0000000
--- a/docs/classes/maxh.Nominatim.QueryTrait.html
+++ /dev/null
@@ -1,689 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
-    <meta charset="utf-8"/>
-    <title>API Documentation</title>
-    <meta name="author" content=""/>
-    <meta name="description" content=""/>
-
-    <link href="../css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
-    <link href="../css/font-awesome.min.css" rel="stylesheet">
-    <link href="../css/prism.css" rel="stylesheet" media="all"/>
-    <link href="../css/template.css" rel="stylesheet" media="all"/>
-    
-    <!--[if lt IE 9]>
-    <script src="../js/html5.js"></script>
-    <![endif]-->
-    <script src="../js/jquery-1.11.0.min.js"></script>
-    <script src="../js/ui/1.10.4/jquery-ui.min.js"></script>
-    <script src="../js/bootstrap.min.js"></script>
-    <script src="../js/jquery.smooth-scroll.js"></script>
-    <script src="../js/prism.min.js"></script>
-    <!-- TODO: Add http://jscrollpane.kelvinluck.com/ to style the scrollbars for browsers not using webkit-->
-    <script type="text/javascript">
-    function loadExternalCodeSnippets() {
-        Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function (pre) {
-            var src = pre.getAttribute('data-src');
-            var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
-            var language = 'php';
-
-            var code = document.createElement('code');
-            code.className = 'language-' + language;
-
-            pre.textContent = '';
-
-            code.textContent = 'Loading…';
-
-            pre.appendChild(code);
-
-            var xhr = new XMLHttpRequest();
-
-            xhr.open('GET', src, true);
-
-            xhr.onreadystatechange = function () {
-                if (xhr.readyState == 4) {
-
-                    if (xhr.status < 400 && xhr.responseText) {
-                        code.textContent = xhr.responseText;
-
-                        Prism.highlightElement(code);
-                    }
-                    else if (xhr.status >= 400) {
-                        code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
-                    }
-                    else {
-                        code.textContent = '✖ Error: File does not exist or is empty';
-                    }
-                }
-            };
-
-            xhr.send(null);
-        });
-    }
-
-    $(document).ready(function(){
-        loadExternalCodeSnippets();
-    });
-    $('#source-view').on('shown', function () {
-        loadExternalCodeSnippets();
-    })
-</script>
-
-    <link rel="shortcut icon" href="../images/favicon.ico"/>
-    <link rel="apple-touch-icon" href="../images/apple-touch-icon.png"/>
-    <link rel="apple-touch-icon" sizes="72x72" href="../images/apple-touch-icon-72x72.png"/>
-    <link rel="apple-touch-icon" sizes="114x114" href="../images/apple-touch-icon-114x114.png"/>
-</head>
-<body>
-
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <i class="icon-ellipsis-vertical"></i>
-            </a>
-            <a class="brand" href="../index.html">API Documentation</a>
-
-            <div class="nav-collapse">
-                <ul class="nav pull-right">
-                                        <li class="dropdown">
-                        <a href="../index.html" class="dropdown-toggle" data-toggle="dropdown">
-                            API Documentation <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                                                        <li><a href="../namespaces/maxh.html">\maxh</a></li>
-                                                    </ul>
-                    </li>
-                                        <li class="dropdown" id="charts-menu">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            Charts <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a href="../graphs/class.html">
-                                    <i class="icon-list-alt"></i>&#160;Class hierarchy diagram
-                                </a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="dropdown" id="reports-menu">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            Reports <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">0</span>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="../reports/markers.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Markers <span class="label label-info pull-right">0</span>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="../reports/deprecated.html">
-                                                                                                            <i class="icon-list-alt"></i>&#160;Deprecated <span class="label label-info pull-right">0</span>
-                                </a>
-                            </li>
-                        </ul>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <!--<div class="go_to_top">-->
-    <!--<a href="#___" style="color: inherit">Back to top&#160;&#160;<i class="icon-upload icon-white"></i></a>-->
-    <!--</div>-->
-</div>
-
-<div id="___" class="container-fluid">
-        <section class="row-fluid">
-        <div class="span2 sidebar">
-                                <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-773992283"></a>
-                                <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
-            </div>
-            <div id="namespace-773992283" class="accordion-body collapse in">
-                <div class="accordion-inner">
-
-                                                    <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-63494996"></a>
-                                <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
-            </div>
-            <div id="namespace-63494996" class="accordion-body collapse ">
-                <div class="accordion-inner">
-
-                                                    <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-71019109"></a>
-                                <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
-            </div>
-            <div id="namespace-71019109" class="accordion-body collapse ">
-                <div class="accordion-inner">
-
-                                                    <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-835498186"></a>
-                                <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
-            </div>
-            <div id="namespace-835498186" class="accordion-body collapse ">
-                <div class="accordion-inner">
-
-                    
-                    <ul>
-                                                                                                    <li class="class"><a href="../classes/maxh.Nominatim.Exceptions.InvalidParameterException.html">InvalidParameterException</a></li>
-                                                    <li class="class"><a href="../classes/maxh.Nominatim.Exceptions.NominatimException.html">NominatimException</a></li>
-                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-                    
-                    <ul>
-                                                    <li class="interface"><a href="../classes/maxh.Nominatim.QueryInterface.html">QueryInterface</a></li>
-                                                                            <li class="trait"><a href="../classes/maxh.Nominatim.QueryTrait.html">QueryTrait</a></li>
-                                                                            <li class="class"><a href="../classes/maxh.Nominatim.Nominatim.html">Nominatim</a></li>
-                                                    <li class="class"><a href="../classes/maxh.Nominatim.Reverse.html">Reverse</a></li>
-                                                    <li class="class"><a href="../classes/maxh.Nominatim.Search.html">Search</a></li>
-                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-                    
-                    <ul>
-                                                                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-                    
-                    <ul>
-                                                                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-        </div>
-    </section>
-    <section class="row-fluid">
-        <div class="span10 offset2">
-            <div class="row-fluid">
-                <div class="span8 content class">
-                    <nav>
-                                                <a href="../namespaces/maxh.Nominatim.html">\maxh\Nominatim</a> <i class="icon-level-up"></i>
-                                            </nav>
-                    <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal"><i class="icon-code"></i></a>
-
-                    <h1><small>\maxh\Nominatim</small>QueryTrait</h1>
-                    <p><em>Trait implementing functionality common to requests nominatim.</em></p>
-                    
-                    
-                                        
-                    <section id="summary">
-                        <h2>Summary</h2>
-                        <section class="row-fluid heading">
-                            <section class="span4">
-                                <a href="#methods">Methods</a>
-                            </section>
-                            <section class="span4">
-                                <a href="#properties">Properties</a>
-                            </section>
-                            <section class="span4">
-                                <a href="#constants">Constants</a>
-                            </section>
-                        </section>
-                        <section class="row-fluid public">
-                            <section class="span4">
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_getPath" class="">getPath()</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_getQuery" class="">getQuery()</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_getFormat" class="">getFormat()</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_getQueryString" class="">getQueryString()</a><br />
-                                                            </section>
-                            <section class="span4">
-                                                                    <em>No public properties found</em>
-                                                            </section>
-                            <section class="span4">
-                                                                    <em>No constants found</em>
-                                                            </section>
-                        </section>
-                        <section class="row-fluid protected">
-                            <section class="span4">
-                                                                    <em>No protected methods found</em>
-                                                            </section>
-                            <section class="span4">
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#property_path" class="">$path</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#property_query" class="">$query</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#property_format" class="">$format</a><br />
-                                                            </section>
-                            <section class="span4">
-                                <em>N/A</em>
-                            </section>
-                        </section>
-                        <section class="row-fluid private">
-                            <section class="span4">
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_setPath" class="">setPath()</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_setQuery" class="">setQuery()</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.QueryTrait.html#method_setFormat" class="">setFormat()</a><br />
-                                                            </section>
-                            <section class="span4">
-                                                                    <em>No private properties found</em>
-                                                            </section>
-                            <section class="span4">
-                                <em>N/A</em>
-                            </section>
-                        </section>
-                    </section>
-                </div>
-                <aside class="span4 detailsbar">
-                                        
-                    
-                    <dl>
-                        <dt>File</dt>
-                            <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">maxh\nominatim</div></dd>
-                                                <dt>Class hierarchy</dt>
-                            <dd class="hierarchy">
-                                                                                                                                                                    <div class="namespace-wrapper">\maxh\Nominatim\QueryTrait</div>
-                            </dd>
-
-                        
-                        
-                        
-                        
-                                                                        </dl>
-                    <h2>Tags</h2>
-                    <table class="table table-condensed">
-                                            <tr><td colspan="2"><em>None found</em></td></tr>
-                                        </table>
-                </aside>
-            </div>
-
-                        
-                                    <a id="properties" name="properties"></a>
-            <div class="row-fluid">
-                <div class="span8 content class">
-                    <h2>Properties</h2>
-                </div>
-                <aside class="span4 detailsbar"></aside>
-            </div>
-
-                                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="property_path" name="property_path" class="anchor"></a>
-            <article class="property">
-                <h3 class="protected ">$path</h3>
-                <pre class="signature">$path : string</pre>
-                <p><em>Contain the path of the request</em></p>
-                
-
-                                <h4>Type</h4>
-                string
-                                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                        <dl>
-                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="property_query" name="property_query" class="anchor"></a>
-            <article class="property">
-                <h3 class="protected ">$query</h3>
-                <pre class="signature">$query : array</pre>
-                <p><em>Contain the query for request</em></p>
-                
-
-                                <h4>Type</h4>
-                array
-                                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                        <dl>
-                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="property_format" name="property_format" class="anchor"></a>
-            <article class="property">
-                <h3 class="protected ">$format</h3>
-                <pre class="signature">$format : string</pre>
-                <p><em>Contain the format for decode data returning by the request</em></p>
-                
-
-                                <h4>Type</h4>
-                string
-                                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                        <dl>
-                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                            
-                                    <a id="methods" name="methods"></a>
-            <div class="row-fluid">
-                <div class="span8 content class"><h2>Methods</h2></div>
-                <aside class="span4 detailsbar"></aside>
-            </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_getPath" name="method_getPath" class="anchor"></a>
-            <article class="method">
-                <h3 class="public ">getPath()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">getPath() : string</pre>
-                <p><em>Get path</em></p>
-                
-
-                
-                
-                                    <h4>Returns</h4>
-                    string
-                                    				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_getQuery" name="method_getQuery" class="anchor"></a>
-            <article class="method">
-                <h3 class="public ">getQuery()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">getQuery() : array</pre>
-                <p><em>Get query</em></p>
-                
-
-                
-                
-                                    <h4>Returns</h4>
-                    array
-                                    				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_getFormat" name="method_getFormat" class="anchor"></a>
-            <article class="method">
-                <h3 class="public ">getFormat()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">getFormat() : string</pre>
-                <p><em>Get format</em></p>
-                
-
-                
-                
-                                    <h4>Returns</h4>
-                    string
-                                    				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_getQueryString" name="method_getQueryString" class="anchor"></a>
-            <article class="method">
-                <h3 class="public ">getQueryString()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">getQueryString() : string</pre>
-                <p><em>Returns the URL-encoded query.</em></p>
-                
-
-                
-                
-                                    <h4>Returns</h4>
-                    string
-                                    				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_setPath" name="method_setPath" class="anchor"></a>
-            <article class="method">
-                <h3 class="private ">setPath()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">setPath(string  <span class="argument">$path</span>) </pre>
-                <p><em>Set path</em></p>
-                
-
-                                    <h4>Parameters</h4>
-                    <table class="table table-condensed table-hover">
-                                                    <tr>
-                                <td>string</td>
-                                <td>$path </td>
-                                <td><p>Name's path of the service</p></td>
-                            </tr>
-                                            </table>
-                
-                
-                				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_setQuery" name="method_setQuery" class="anchor"></a>
-            <article class="method">
-                <h3 class="private ">setQuery()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">setQuery(array  <span class="argument">$query = array()</span>) </pre>
-                <p><em>Set query</em></p>
-                
-
-                                    <h4>Parameters</h4>
-                    <table class="table table-condensed table-hover">
-                                                    <tr>
-                                <td>array</td>
-                                <td>$query </td>
-                                <td><p>Parameter of the query</p></td>
-                            </tr>
-                                            </table>
-                
-                
-                				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    <div class="row-fluid">
-        <div class="span8 content class">
-            <a id="method_setFormat" name="method_setFormat" class="anchor"></a>
-            <article class="method">
-                <h3 class="private ">setFormat()</h3>
-                <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">setFormat(string  <span class="argument">$format</span>) </pre>
-                <p><em>Set format</em></p>
-                
-
-                                    <h4>Parameters</h4>
-                    <table class="table table-condensed table-hover">
-                                                    <tr>
-                                <td>string</td>
-                                <td>$format </td>
-                                <td><p>Format returning by the response</p></td>
-                            </tr>
-                                            </table>
-                
-                
-                				
-                            </article>
-        </div>
-        <aside class="span4 detailsbar">
-            <h1><i class="icon-arrow-down"></i></h1>
-                                                            <dl>
-                                    <dt>File</dt>
-                    <dd><a href="../files/QueryTrait.html"><div class="path-wrapper">QueryTrait.php</div></a></dd>
-                                                                            </dl>
-            <h2>Tags</h2>
-            <table class="table table-condensed">
-                                    <tr><td colspan="2"><em>None found</em></td></tr>
-                            </table>
-        </aside>
-    </div>
-
-                                    </div>
-    </section>
-
-    <div id="source-view" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="source-view-label" aria-hidden="true">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="source-view-label">QueryTrait.php</h3>
-        </div>
-        <div class="modal-body">
-            <pre data-src="../files/QueryTrait.php.txt" class="language-php line-numbers"></pre>
-        </div>
-    </div>
-
-    <footer class="row-fluid">
-        <section class="span10 offset2">
-            <section class="row-fluid">
-                <section class="span10 offset1">
-                    <section class="row-fluid footer-sections">
-                        <section class="span4">
-                                                        <h1><i class="icon-code"></i></h1>
-                            <div>
-                                <ul>
-                                                                            <li><a href="../namespaces/maxh.html">\maxh</a></li>
-                                                                    </ul>
-                            </div>
-                        </section>
-                        <section class="span4">
-                                                        <h1><i class="icon-bar-chart"></i></h1>
-                            <div>
-                                <ul>
-                                    <li><a href="../graphs/class.html">Class Hierarchy Diagram</a></li>
-                                </ul>
-                            </div>
-                        </section>
-                        <section class="span4">
-                                                        <h1><i class="icon-pushpin"></i></h1>
-                            <div>
-                                <ul>
-                                    <li><a href="../reports/errors.html">Errors</a></li>
-                                    <li><a href="../reports/markers.html">Markers</a></li>
-                                </ul>
-                            </div>
-                        </section>
-                    </section>
-                </section>
-            </section>
-            <section class="row-fluid">
-                <section class="span10 offset1">
-                    <hr />
-                    Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 6th, 2017 at 19:50.
-                </section>
-            </section>
-        </section>
-    </footer>
-</div>
-
-</body>
-</html>
diff --git a/docs/classes/maxh.Nominatim.Reverse.html b/docs/classes/maxh.Nominatim.Reverse.html
index 9d70477..e5ef0c3 100644
--- a/docs/classes/maxh.Nominatim.Reverse.html
+++ b/docs/classes/maxh.Nominatim.Reverse.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-271985687"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-600941748"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-271985687" class="accordion-body collapse in">
+            <div id="namespace-600941748" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-587731999"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-820458929"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-587731999" class="accordion-body collapse ">
+            <div id="namespace-820458929" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1106060537"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-94380514"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1106060537" class="accordion-body collapse ">
+            <div id="namespace-94380514" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1298357449"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1849261610"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1298357449" class="accordion-body collapse ">
+            <div id="namespace-1849261610" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -282,7 +282,7 @@ <h2>Summary</h2>
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_path" class="">$path</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_query" class="">$query</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_format" class="">$format</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_accepteFormat" class="">$accepteFormat</a><br />
+                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_acceptedFormat" class="">$acceptedFormat</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_polygon" class="">$polygon</a><br />
                                                             </section>
                             <section class="span4">
@@ -309,7 +309,7 @@ <h2>Summary</h2>
                         <dt>File</dt>
                             <dd><a href="../files/Reverse.html"><div class="path-wrapper">Reverse.php</div></a></dd>
                                                 <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
                             <dd class="hierarchy">
                                                                                                                                                                                                                                                                                                 
@@ -444,10 +444,10 @@ <h2>Tags</h2>
 
                                     <div class="row-fluid">
         <div class="span8 content class">
-            <a id="property_accepteFormat" name="property_accepteFormat" class="anchor"></a>
+            <a id="property_acceptedFormat" name="property_acceptedFormat" class="anchor"></a>
             <article class="property">
-                <h3 class="protected ">$accepteFormat</h3>
-                <pre class="signature">$accepteFormat : array</pre>
+                <h3 class="protected ">$acceptedFormat</h3>
+                <pre class="signature">$acceptedFormat : array</pre>
                 <p><em>Output format accepted</em></p>
                 
 
@@ -541,7 +541,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">format()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Format returning by the request.</em></p>
                 
 
@@ -561,7 +561,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -584,7 +584,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">language()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Preferred language order for showing search results, overrides the value
 specified in the &quot;Accept-Language&quot; HTTP header. Either uses standard
 rfc2616 accept-language string or a simple comma separated list of
@@ -604,7 +604,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -627,7 +627,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">addressDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a breakdown of the address into elements.</em></p>
                 
 
@@ -642,7 +642,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -665,7 +665,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">email()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>If you are making large numbers of request please include a valid email address or alternatively include your
 email address as part of the User-Agent string. This information will be kept confidential and only used to
 contact you in the event of a problem, see Usage Policy for more details.</em></p>
@@ -682,7 +682,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -705,7 +705,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">polygon()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">polygon(string  <span class="argument">$polygon</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">polygon(string  <span class="argument">$polygon</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Query</pre>
                 <p><em>Output format for the geometry of results</em></p>
                 
 
@@ -725,7 +725,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
                                     				
                             </article>
         </div>
@@ -748,7 +748,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">extraTags()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include additional information in the result if available</em></p>
                 
 
@@ -763,7 +763,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -786,7 +786,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">nameDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a list of alternative names in the results.</em></p>
                 <p>These may include language variants, references, operator and brand.</p>
 
@@ -801,7 +801,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -1254,7 +1254,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/classes/maxh.Nominatim.Search.html b/docs/classes/maxh.Nominatim.Search.html
index a90e600..fa08b7a 100644
--- a/docs/classes/maxh.Nominatim.Search.html
+++ b/docs/classes/maxh.Nominatim.Search.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-51851014"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-600875560"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-51851014" class="accordion-body collapse in">
+            <div id="namespace-600875560" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1413361279"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1347396446"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1413361279" class="accordion-body collapse ">
+            <div id="namespace-1347396446" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-444367496"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1627945480"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-444367496" class="accordion-body collapse ">
+            <div id="namespace-1627945480" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1257131428"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-979786925"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1257131428" class="accordion-body collapse ">
+            <div id="namespace-979786925" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -289,7 +289,7 @@ <h2>Summary</h2>
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_path" class="">$path</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_query" class="">$query</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_format" class="">$format</a><br />
-                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_accepteFormat" class="">$accepteFormat</a><br />
+                                                                    <a href="../classes/maxh.Nominatim.Query.html#property_acceptedFormat" class="">$acceptedFormat</a><br />
                                                                     <a href="../classes/maxh.Nominatim.Query.html#property_polygon" class="">$polygon</a><br />
                                                             </section>
                             <section class="span4">
@@ -316,7 +316,7 @@ <h2>Summary</h2>
                         <dt>File</dt>
                             <dd><a href="../files/Search.html"><div class="path-wrapper">Search.php</div></a></dd>
                                                 <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">maxh\Nominatim</div></dd>
                                                 <dt>Class hierarchy</dt>
                             <dd class="hierarchy">
                                                                                                                                                                                                                                                                                                 
@@ -427,10 +427,10 @@ <h2>Tags</h2>
 
                                     <div class="row-fluid">
         <div class="span8 content class">
-            <a id="property_accepteFormat" name="property_accepteFormat" class="anchor"></a>
+            <a id="property_acceptedFormat" name="property_acceptedFormat" class="anchor"></a>
             <article class="property">
-                <h3 class="protected ">$accepteFormat</h3>
-                <pre class="signature">$accepteFormat : array</pre>
+                <h3 class="protected ">$acceptedFormat</h3>
+                <pre class="signature">$acceptedFormat : array</pre>
                 <p><em>Output format accepted</em></p>
                 
 
@@ -524,7 +524,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">format()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">format(string  <span class="argument">$format</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Format returning by the request.</em></p>
                 
 
@@ -544,7 +544,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -567,7 +567,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">language()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">language(string  <span class="argument">$language</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Preferred language order for showing search results, overrides the value
 specified in the &quot;Accept-Language&quot; HTTP header. Either uses standard
 rfc2616 accept-language string or a simple comma separated list of
@@ -587,7 +587,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -610,7 +610,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">addressDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">addressDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a breakdown of the address into elements.</em></p>
                 
 
@@ -625,7 +625,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -648,7 +648,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">email()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">email(string  <span class="argument">$email</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>If you are making large numbers of request please include a valid email address or alternatively include your
 email address as part of the User-Agent string. This information will be kept confidential and only used to
 contact you in the event of a problem, see Usage Policy for more details.</em></p>
@@ -665,7 +665,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -688,7 +688,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">polygon()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">polygon(string  <span class="argument">$polygon</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">polygon(string  <span class="argument">$polygon</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Query</pre>
                 <p><em>Output format for the geometry of results</em></p>
                 
 
@@ -708,7 +708,7 @@ <h4>Throws</h4>
                                                                     </dl>
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
                                     				
                             </article>
         </div>
@@ -731,7 +731,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">extraTags()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">extraTags(boolean  <span class="argument">$tags = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include additional information in the result if available</em></p>
                 
 
@@ -746,7 +746,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -769,7 +769,7 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">nameDetails()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Query</pre>
+                <pre class="signature" style="margin-right: 54px;">nameDetails(boolean  <span class="argument">$details = true</span>) : \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup</pre>
                 <p><em>Include a list of alternative names in the results.</em></p>
                 <p>These may include language variants, references, operator and brand.</p>
 
@@ -784,7 +784,7 @@ <h4>Parameters</h4>
                 
                 
                                     <h4>Returns</h4>
-                    <a href="../classes/maxh.Nominatim.Query.html">\maxh\Nominatim\Query</a>
+                    <a href="../classes/maxh.Nominatim.Search.html">\maxh\Nominatim\Search</a>|<a href="../classes/maxh.Nominatim.Reverse.html">\maxh\Nominatim\Reverse</a>|<a href="../classes/maxh.Nominatim.Lookup.html">\maxh\Nominatim\Lookup</a>
                                     				
                             </article>
         </div>
@@ -1147,14 +1147,14 @@ <h2>Tags</h2>
             <article class="method">
                 <h3 class="public ">postalCode()</h3>
                 <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal" style="font-size: 1.1em; padding: 9px 14px"><i class="icon-code"></i></a>
-                <pre class="signature" style="margin-right: 54px;">postalCode(integer  <span class="argument">$postalCode</span>) : \maxh\Nominatim\Search</pre>
+                <pre class="signature" style="margin-right: 54px;">postalCode(string  <span class="argument">$postalCode</span>) : \maxh\Nominatim\Search</pre>
                 <p><em>Postal code to search for (experimental).</em></p>
                 <p>Do not combine with query().</p>
 
                                     <h4>Parameters</h4>
                     <table class="table table-condensed table-hover">
                                                     <tr>
-                                <td>integer</td>
+                                <td>string</td>
                                 <td>$postalCode </td>
                                 <td><p>The postal code</p></td>
                             </tr>
@@ -1497,7 +1497,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Exceptions.InvalidParameterException.html b/docs/files/Exceptions.InvalidParameterException.html
index f8ef607..0238a40 100644
--- a/docs/files/Exceptions.InvalidParameterException.html
+++ b/docs/files/Exceptions.InvalidParameterException.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-929513802"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1309605418"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-929513802" class="accordion-body collapse in">
+            <div id="namespace-1309605418" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1360327228"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-125708393"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1360327228" class="accordion-body collapse ">
+            <div id="namespace-125708393" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-101076793"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1479269422"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-101076793" class="accordion-body collapse ">
+            <div id="namespace-1479269422" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1250799326"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1569471442"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1250799326" class="accordion-body collapse ">
+            <div id="namespace-1569471442" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -227,7 +227,7 @@
                                                                     </nav>
 
                     <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal"><i class="icon-code"></i></a>
-                    <h1><small></small>InvalidParameterException.php</h1>
+                    <h1><small>Exceptions</small>InvalidParameterException.php</h1>
                     <p><em>This file contains code about maxh\Nominatim\Exceptions\InvalidParameterException class</em></p>
                     
 
@@ -245,13 +245,20 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\Default</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
                     <h2>Tags</h2>
                     <table class="table table-condensed">
-                                                    <tr><td colspan="2"><em>None found</em></td></tr>
+                                                    <tr>
+                                <th>
+                                    author
+                                </th>
+                                <td>
+                                                                            <p>Maxime Hélias <a href="mailto:maximehelias16@gmail.com">maximehelias16@gmail.com</a></p>
+                                                                    </td>
+                            </tr>
                                             </table>
 
                 </aside>
@@ -268,7 +275,7 @@ <h2>Tags</h2>
             <h3 id="source-view-label"></h3>
         </div>
         <div class="modal-body">
-            <pre data-src="../files/Exceptions\InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
+            <pre data-src="../files/Exceptions/InvalidParameterException.php.txt" class="language-php line-numbers"></pre>
         </div>
     </div>
 
@@ -309,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Exceptions.NominatimException.html b/docs/files/Exceptions.NominatimException.html
index f74bc84..3d8c0b8 100644
--- a/docs/files/Exceptions.NominatimException.html
+++ b/docs/files/Exceptions.NominatimException.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-453034186"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-243747075"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-453034186" class="accordion-body collapse in">
+            <div id="namespace-243747075" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-545987236"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-176631686"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-545987236" class="accordion-body collapse ">
+            <div id="namespace-176631686" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-696100803"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1007917670"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-696100803" class="accordion-body collapse ">
+            <div id="namespace-1007917670" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1657565296"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2123624429"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1657565296" class="accordion-body collapse ">
+            <div id="namespace-2123624429" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -227,7 +227,7 @@
                                                                     </nav>
 
                     <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal"><i class="icon-code"></i></a>
-                    <h1><small></small>NominatimException.php</h1>
+                    <h1><small>Exceptions</small>NominatimException.php</h1>
                     <p><em>This file contains code about maxh\Nominatim\Exceptions\NominatimException class</em></p>
                     
 
@@ -245,13 +245,20 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\Default</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
                     <h2>Tags</h2>
                     <table class="table table-condensed">
-                                                    <tr><td colspan="2"><em>None found</em></td></tr>
+                                                    <tr>
+                                <th>
+                                    author
+                                </th>
+                                <td>
+                                                                            <p>Maxime Hélias <a href="mailto:maximehelias16@gmail.com">maximehelias16@gmail.com</a></p>
+                                                                    </td>
+                            </tr>
                                             </table>
 
                 </aside>
@@ -268,7 +275,7 @@ <h2>Tags</h2>
             <h3 id="source-view-label"></h3>
         </div>
         <div class="modal-body">
-            <pre data-src="../files/Exceptions\NominatimException.php.txt" class="language-php line-numbers"></pre>
+            <pre data-src="../files/Exceptions/NominatimException.php.txt" class="language-php line-numbers"></pre>
         </div>
     </div>
 
@@ -309,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Exceptions/InvalidParameterException.php.txt b/docs/files/Exceptions/InvalidParameterException.php.txt
index 0be2516..d7ae2c7 100644
--- a/docs/files/Exceptions/InvalidParameterException.php.txt
+++ b/docs/files/Exceptions/InvalidParameterException.php.txt
@@ -1,6 +1,9 @@
 <?php
 /**
  * This file contains code about maxh\Nominatim\Exceptions\InvalidParameterException class
+ *
+ * @package      maxh\Nominatim
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
 namespace maxh\Nominatim\Exceptions;
diff --git a/docs/files/Exceptions/NominatimException.php.txt b/docs/files/Exceptions/NominatimException.php.txt
index 74181e0..bae56ad 100644
--- a/docs/files/Exceptions/NominatimException.php.txt
+++ b/docs/files/Exceptions/NominatimException.php.txt
@@ -1,6 +1,9 @@
 <?php
 /**
  * This file contains code about maxh\Nominatim\Exceptions\NominatimException class
+ *
+ * @package      maxh\Nominatim
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
 namespace maxh\Nominatim\Exceptions;
@@ -44,7 +47,7 @@ class NominatimException extends Exception
      */
     public function __construct(
         $message,
-        RequestInterface $request,
+        RequestInterface $request = null,
         ResponseInterface $response = null,
         Exception $previous = null
     ) {
@@ -59,16 +62,16 @@ class NominatimException extends Exception
 
     /**
      * Return the Request
-     * @return \GuzzleHttp\Psr7\Request
+     * @return RequestInterface
      */
-    public function getRequest()
+    public function getRequest(): RequestInterface
     {
         return $this->request;
     }
 
     /**
      * Return the Response
-     * @return \GuzzleHttp\Psr7\Response [description]
+     * @return PromiseInterface|ResponseInterface
      */
     public function getResponse()
     {
diff --git a/docs/files/Lookup.html b/docs/files/Lookup.html
index 19ab57d..9a0a1ae 100644
--- a/docs/files/Lookup.html
+++ b/docs/files/Lookup.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-34439707"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1615685472"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-34439707" class="accordion-body collapse in">
+            <div id="namespace-1615685472" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1949334139"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-101226097"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1949334139" class="accordion-body collapse ">
+            <div id="namespace-101226097" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-115295662"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-633371350"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-115295662" class="accordion-body collapse ">
+            <div id="namespace-633371350" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-84830537"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1075720281"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-84830537" class="accordion-body collapse ">
+            <div id="namespace-1075720281" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -245,7 +245,7 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
@@ -316,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Lookup.php.txt b/docs/files/Lookup.php.txt
index 76ccf46..f71f2da 100644
--- a/docs/files/Lookup.php.txt
+++ b/docs/files/Lookup.php.txt
@@ -2,7 +2,7 @@
 /**
  * Class Lookup
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -20,6 +20,7 @@ class Lookup extends Query
 
     /**
      * Constuctor
+     *
      * @param array $query Default value for this query
      */
     public function __construct(array $query = [])
@@ -38,7 +39,7 @@ class Lookup extends Query
      *
      * @return \maxh\Nominatim\Lookup
      */
-    public function osmIds($id)
+    public function osmIds(string $id): Lookup
     {
         $this->query['osm_ids'] = $id;
 
@@ -53,7 +54,7 @@ class Lookup extends Query
      * @return void
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  Polygon is not supported with lookup
      */
-    public function polygon($polygon)
+    public function polygon(string $polygon)
     {
         throw new InvalidParameterException('The polygon is not supported with lookup');
     }
diff --git a/docs/files/Nominatim.html b/docs/files/Nominatim.html
index ff69f0e..e1262f3 100644
--- a/docs/files/Nominatim.html
+++ b/docs/files/Nominatim.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1513231043"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1600160556"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1513231043" class="accordion-body collapse in">
+            <div id="namespace-1600160556" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1366168657"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1290146962"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1366168657" class="accordion-body collapse ">
+            <div id="namespace-1290146962" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-764014142"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-15058297"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-764014142" class="accordion-body collapse ">
+            <div id="namespace-15058297" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-484290878"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1797302182"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-484290878" class="accordion-body collapse ">
+            <div id="namespace-1797302182" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -245,7 +245,7 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
@@ -316,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Nominatim.php.txt b/docs/files/Nominatim.php.txt
index 6b7699f..eea4b4d 100644
--- a/docs/files/Nominatim.php.txt
+++ b/docs/files/Nominatim.php.txt
@@ -2,7 +2,7 @@
 /**
  * Class Nominatim
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -12,12 +12,12 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Request;
 use Psr\Http\Message\ResponseInterface;
 
-use maxh\Nominatim\Exceptions\InvalidParameterException;
 use maxh\Nominatim\Exceptions\NominatimException;
 
 /**
  *  Wrapper to manage exchanges with OSM Nominatim API
  *
+ * @see http://wiki.openstreetmap.org/wiki/Nominatim
  */
 class Nominatim
 {
@@ -30,7 +30,7 @@ class Nominatim
 
     /**
      * Contain http client connection
-     * @var Client
+     * @var \GuzzleHttp\Client
      */
     private $http_client;
 
@@ -38,37 +38,37 @@ class Nominatim
      * The search object which serves as a template for new ones created
      * by 'newSearch()' method.
      *
-     * @var Search
+     * @var \maxh\Nominatim\Search
      */
     private $baseSearch;
 
     /**
      * Template for new ones created by 'newReverser()' method.
-     * @var Reverse
+     * @var \maxh\Nominatim\Reverse
      */
     private $baseReverse;
 
     /**
      * Template for new ones created by 'newLookup()' method.
-     * @var Lookup
+     * @var \maxh\Nominatim\Lookup
      */
     private $baseLookup;
 
     /**
      * Constructor
      *
-     * @param string              $application_url Contain url of the current application
-     * @param \GuzzleHttp\Client|null $http_client     Client object from Guzzle
+     * @param string $application_url Contain url of the current application
+     * @param \GuzzleHttp\Client|null $http_client Client object from Guzzle
      *
-     * @throws \maxh\Nominatim\Exceptions\InvalidParameterException
+     * @throws \maxh\Nominatim\Exceptions\NominatimException
      */
     public function __construct(
-        $application_url,
+        string $application_url,
         Client $http_client = null
     ) {
 
         if (empty($application_url)) {
-            throw new InvalidParameterException('Application url parameter is empty');
+            throw new NominatimException('Application url parameter is empty');
         }
 
         if ($http_client === null) {
@@ -81,12 +81,14 @@ class Nominatim
             $application_url_client = $http_client->getConfig('base_uri');
 
             if (empty($application_url_client)) {
-                $http_client->setDefaultOption('base_uri', $application_url);
-            } elseif ($application_url_client !== $application_url) {
-                throw new InvalidParameterException("http_client parameter hasn't the same url application.");
+                throw new NominatimException('http_client must have a configured base_uri.');
+            }
+
+            if ($application_url_client !== $application_url) {
+                throw new NominatimException("http_client parameter hasn't the same url application.");
             }
         } else {
-            throw new InvalidParameterException('http_client parameter must be a \\GuzzleHttp\\Client object or empty');
+            throw new NominatimException('http_client parameter must be a \\GuzzleHttp\\Client object or empty');
         }
 
         $this->application_url = $application_url;
@@ -101,29 +103,29 @@ class Nominatim
     /**
      * Returns a new search object based on the base search.
      *
-     * @return Search
+     * @return \maxh\Nominatim\Search
      */
-    public function newSearch()
+    public function newSearch(): Search
     {
         return clone $this->baseSearch;
     }
 
     /**
-     * Returns a new search object based on the base reverse.
+     * Returns a new reverse object based on the base reverse.
      *
-     * @return Reverse
+     * @return \maxh\Nominatim\Reverse
      */
-    public function newReverse()
+    public function newReverse(): Reverse
     {
         return clone $this->baseReverse;
     }
 
     /**
-     * Returns a new search object based on the base lookup.
+     * Returns a new lookup object based on the base lookup.
      *
-     * @return Lookup
+     * @return \maxh\Nominatim\Lookup
      */
-    public function newLookup()
+    public function newLookup(): Lookup
     {
         return clone $this->baseLookup;
     }
@@ -138,7 +140,7 @@ class Nominatim
      * @return array|\SimpleXMLElement
      * @throws \maxh\Nominatim\Exceptions\NominatimException if no format for decode
      */
-    private function decodeResponse($format, Request $request, ResponseInterface $response)
+    private function decodeResponse(string $format, Request $request, ResponseInterface $response)
     {
         if ($format === 'json') {
             return json_decode($response->getBody(), true);
@@ -156,7 +158,7 @@ class Nominatim
      *
      * @param  QueryInterface $nRequest The object request to send
      *
-     * @return array                                         The decoded data returned from Nominatim
+     * @return array|\SimpleXMLElement                                         The decoded data returned from Nominatim
      * @throws \GuzzleHttp\Exception\ClientException         if http request is an error
      * @throws \maxh\Nominatim\Exceptions\NominatimException if no format for decode
      */
@@ -182,7 +184,7 @@ class Nominatim
      * Return the client using by instance
      * @return \GuzzleHttp\Client
      */
-    public function getClient()
+    public function getClient(): Client
     {
         return $this->http_client;
     }
diff --git a/docs/files/Query.html b/docs/files/Query.html
index 6504f94..5ea105c 100644
--- a/docs/files/Query.html
+++ b/docs/files/Query.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-2011308010"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-613213859"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-2011308010" class="accordion-body collapse in">
+            <div id="namespace-613213859" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1079035564"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1212856128"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1079035564" class="accordion-body collapse ">
+            <div id="namespace-1212856128" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1008386757"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1872872873"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1008386757" class="accordion-body collapse ">
+            <div id="namespace-1872872873" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-576308930"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-323477202"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-576308930" class="accordion-body collapse ">
+            <div id="namespace-323477202" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -245,7 +245,7 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
@@ -316,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Query.php.txt b/docs/files/Query.php.txt
index 7926b5a..5acf0f3 100644
--- a/docs/files/Query.php.txt
+++ b/docs/files/Query.php.txt
@@ -2,7 +2,7 @@
 /**
  * Class Query
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -13,7 +13,7 @@ use maxh\Nominatim\Exceptions\InvalidParameterException;
 /**
  * Class implementing functionality common to requests nominatim.
  */
-class Query implements QueryInterface
+abstract class Query implements QueryInterface
 {
     /**
      * Contain the path of the request
@@ -37,7 +37,7 @@ class Query implements QueryInterface
      * Output format accepted
      * @var array
      */
-    protected $accepteFormat = ['xml', 'json'];
+    protected $acceptedFormat = ['xml', 'json'];
 
     /**
      * Output polygon format accepted
@@ -68,14 +68,14 @@ class Query implements QueryInterface
      *
      * @param  string $format The output format for the request
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException if format is not supported
      */
-    public function format($format)
+    public function format(string $format): Query
     {
         $format = strtolower($format);
 
-        if (in_array($format, $this->accepteFormat, true)) {
+        if (\in_array($format, $this->acceptedFormat, true)) {
             $this->setFormat($format);
 
             return $this;
@@ -94,9 +94,9 @@ class Query implements QueryInterface
      *                                  specified in the "Accept-Language" HTTP header. Either uses standard rfc2616
      *                                  accept-language string or a simple comma separated list of language codes.
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function language($language)
+    public function language(string $language): Query
     {
         $this->query['accept-language'] = $language;
 
@@ -108,9 +108,9 @@ class Query implements QueryInterface
      *
      * @param  boolean $details
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function addressDetails($details = true)
+    public function addressDetails(bool $details = true): Query
     {
         $this->query['addressdetails'] = $details ? '1' : '0';
 
@@ -124,9 +124,9 @@ class Query implements QueryInterface
      *
      * @param  string $email Address mail
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function email($email)
+    public function email(string $email): Query
     {
         $this->query['email'] = $email;
 
@@ -138,12 +138,12 @@ class Query implements QueryInterface
      *
      * @param  string $polygon
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Query
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  if polygon format is not supported
      */
-    public function polygon($polygon)
+    public function polygon(string $polygon)
     {
-        if (in_array($polygon, $this->polygon, true)) {
+        if (\in_array($polygon, $this->polygon, true)) {
             $this->query['polygon_' . $polygon] = '1';
 
             return $this;
@@ -157,9 +157,9 @@ class Query implements QueryInterface
      *
      * @param  boolean $tags
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function extraTags($tags = true)
+    public function extraTags(bool $tags = true): Query
     {
         $this->query['extratags'] = $tags ? '1' : '0';
 
@@ -172,9 +172,9 @@ class Query implements QueryInterface
      *
      * @param  boolean $details
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function nameDetails($details = true)
+    public function nameDetails(bool $details = true): Query
     {
         $this->query['namedetails'] = $details ? '1' : '0';
 
@@ -186,7 +186,7 @@ class Query implements QueryInterface
      *
      * @return string
      */
-    public function getQueryString()
+    public function getQueryString(): string
     {
         return http_build_query($this->query);
     }
@@ -197,7 +197,7 @@ class Query implements QueryInterface
      * Get path
      * @return string
      */
-    public function getPath()
+    public function getPath(): string
     {
         return $this->path;
     }
@@ -206,7 +206,7 @@ class Query implements QueryInterface
      * Get query
      * @return array
      */
-    public function getQuery()
+    public function getQuery(): array
     {
         return $this->query;
     }
@@ -215,7 +215,7 @@ class Query implements QueryInterface
      * Get format
      * @return string
      */
-    public function getFormat()
+    public function getFormat(): string
     {
         return $this->format;
     }
@@ -224,7 +224,7 @@ class Query implements QueryInterface
      * Set path
      * @param string $path Name's path of the service
      */
-    protected function setPath($path)
+    protected function setPath(string $path)
     {
         $this->path = $path;
     }
@@ -233,7 +233,7 @@ class Query implements QueryInterface
      * Set query
      * @param array $query Parameter of the query
      */
-    protected function setQuery(array $query = [ ])
+    protected function setQuery(array $query = [])
     {
         $this->query = $query;
     }
@@ -242,7 +242,7 @@ class Query implements QueryInterface
      * Set format
      * @param string $format Format returning by the response
      */
-    protected function setFormat($format)
+    protected function setFormat(string $format)
     {
         $this->format = $this->query['format'] = $format;
     }
diff --git a/docs/files/QueryInterface.html b/docs/files/QueryInterface.html
index feb0893..783ff08 100644
--- a/docs/files/QueryInterface.html
+++ b/docs/files/QueryInterface.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1126127874"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-633426785"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1126127874" class="accordion-body collapse in">
+            <div id="namespace-633426785" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-976077528"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1664366419"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-976077528" class="accordion-body collapse ">
+            <div id="namespace-1664366419" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-510773878"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2094668977"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-510773878" class="accordion-body collapse ">
+            <div id="namespace-2094668977" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-742199048"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1235655689"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-742199048" class="accordion-body collapse ">
+            <div id="namespace-1235655689" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -228,7 +228,7 @@
 
                     <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal"><i class="icon-code"></i></a>
                     <h1><small></small>QueryInterface.php</h1>
-                    <p><em>Interface QueryInterce</em></p>
+                    <p><em>Interface QueryInterface</em></p>
                     
 
                     
@@ -245,7 +245,7 @@ <h2>Interfaces</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
@@ -316,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/QueryInterface.php.txt b/docs/files/QueryInterface.php.txt
index 4241420..46c2ea8 100644
--- a/docs/files/QueryInterface.php.txt
+++ b/docs/files/QueryInterface.php.txt
@@ -1,8 +1,8 @@
 <?php
 /**
- * Interface QueryInterce
+ * Interface QueryInterface
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -13,7 +13,7 @@ namespace maxh\Nominatim;
  */
 interface QueryInterface
 {
-    
+
     /**
      * Get path of the request
      *
@@ -23,14 +23,14 @@ interface QueryInterface
      *
      * @return string
      */
-    public function getPath();
+    public function getPath(): string;
 
     /**
      * Get the query to send
      *
      * @return array
      */
-    public function getQuery();
+    public function getQuery(): array;
 
     /**
      * Get the format of the request
@@ -39,6 +39,6 @@ interface QueryInterface
      *
      * @return string
      */
-    public function getFormat();
+    public function getFormat(): string;
 }
 
diff --git a/docs/files/QueryTrait.html b/docs/files/QueryTrait.html
deleted file mode 100644
index b3d89fe..0000000
--- a/docs/files/QueryTrait.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
-    <meta charset="utf-8"/>
-    <title>API Documentation</title>
-    <meta name="author" content=""/>
-    <meta name="description" content=""/>
-
-    <link href="../css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
-    <link href="../css/font-awesome.min.css" rel="stylesheet">
-    <link href="../css/prism.css" rel="stylesheet" media="all"/>
-    <link href="../css/template.css" rel="stylesheet" media="all"/>
-    
-    <!--[if lt IE 9]>
-    <script src="../js/html5.js"></script>
-    <![endif]-->
-    <script src="../js/jquery-1.11.0.min.js"></script>
-    <script src="../js/ui/1.10.4/jquery-ui.min.js"></script>
-    <script src="../js/bootstrap.min.js"></script>
-    <script src="../js/jquery.smooth-scroll.js"></script>
-    <script src="../js/prism.min.js"></script>
-    <!-- TODO: Add http://jscrollpane.kelvinluck.com/ to style the scrollbars for browsers not using webkit-->
-        <script type="text/javascript">
-        function loadExternalCodeSnippets() {
-            Array.prototype.slice.call(document.querySelectorAll('pre[data-src]')).forEach(function (pre) {
-                var src = pre.getAttribute('data-src');
-                var extension = (src.match(/\.(\w+)$/) || [, ''])[1];
-                var language = 'php';
-
-                var code = document.createElement('code');
-                code.className = 'language-' + language;
-
-                pre.textContent = '';
-
-                code.textContent = 'Loading…';
-
-                pre.appendChild(code);
-
-                var xhr = new XMLHttpRequest();
-
-                xhr.open('GET', src, true);
-
-                xhr.onreadystatechange = function () {
-                    if (xhr.readyState == 4) {
-
-                        if (xhr.status < 400 && xhr.responseText) {
-                            code.textContent = xhr.responseText;
-
-                            Prism.highlightElement(code);
-                        }
-                        else if (xhr.status >= 400) {
-                            code.textContent = '✖ Error ' + xhr.status + ' while fetching file: ' + xhr.statusText;
-                        }
-                        else {
-                            code.textContent = '✖ Error: File does not exist or is empty';
-                        }
-                    }
-                };
-
-                xhr.send(null);
-            });
-        }
-
-        $(document).ready(function(){
-            loadExternalCodeSnippets();
-        });
-        $('#source-view').on('shown', function () {
-            loadExternalCodeSnippets();
-        })
-    </script>
-
-    <link rel="shortcut icon" href="../images/favicon.ico"/>
-    <link rel="apple-touch-icon" href="../images/apple-touch-icon.png"/>
-    <link rel="apple-touch-icon" sizes="72x72" href="../images/apple-touch-icon-72x72.png"/>
-    <link rel="apple-touch-icon" sizes="114x114" href="../images/apple-touch-icon-114x114.png"/>
-</head>
-<body>
-
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <div class="container">
-            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                <i class="icon-ellipsis-vertical"></i>
-            </a>
-            <a class="brand" href="../index.html">API Documentation</a>
-
-            <div class="nav-collapse">
-                <ul class="nav pull-right">
-                                        <li class="dropdown">
-                        <a href="../index.html" class="dropdown-toggle" data-toggle="dropdown">
-                            API Documentation <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                                                        <li><a href="../namespaces/maxh.html">\maxh</a></li>
-                                                    </ul>
-                    </li>
-                                        <li class="dropdown" id="charts-menu">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            Charts <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a href="../graphs/class.html">
-                                    <i class="icon-list-alt"></i>&#160;Class hierarchy diagram
-                                </a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="dropdown" id="reports-menu">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                            Reports <b class="caret"></b>
-                        </a>
-                        <ul class="dropdown-menu">
-                            <li>
-                                <a href="../reports/errors.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Errors <span class="label label-info pull-right">0</span>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="../reports/markers.html">
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <i class="icon-list-alt"></i>&#160;Markers <span class="label label-info pull-right">0</span>
-                                </a>
-                            </li>
-                            <li>
-                                <a href="../reports/deprecated.html">
-                                                                                                            <i class="icon-list-alt"></i>&#160;Deprecated <span class="label label-info pull-right">0</span>
-                                </a>
-                            </li>
-                        </ul>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <!--<div class="go_to_top">-->
-    <!--<a href="#___" style="color: inherit">Back to top&#160;&#160;<i class="icon-upload icon-white"></i></a>-->
-    <!--</div>-->
-</div>
-
-<div id="___" class="container-fluid">
-        <section class="row-fluid">
-        <div class="span2 sidebar">
-                                <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1325057963"></a>
-                                <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
-            </div>
-            <div id="namespace-1325057963" class="accordion-body collapse in">
-                <div class="accordion-inner">
-
-                                                    <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-335048429"></a>
-                                <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
-            </div>
-            <div id="namespace-335048429" class="accordion-body collapse ">
-                <div class="accordion-inner">
-
-                                                    <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-242178240"></a>
-                                <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
-            </div>
-            <div id="namespace-242178240" class="accordion-body collapse ">
-                <div class="accordion-inner">
-
-                                                    <div class="accordion" style="margin-bottom: 0">
-        <div class="accordion-group">
-            <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-266464491"></a>
-                                <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
-            </div>
-            <div id="namespace-266464491" class="accordion-body collapse ">
-                <div class="accordion-inner">
-
-                    
-                    <ul>
-                                                                                                    <li class="class"><a href="../classes/maxh.Nominatim.Exceptions.InvalidParameterException.html">InvalidParameterException</a></li>
-                                                    <li class="class"><a href="../classes/maxh.Nominatim.Exceptions.NominatimException.html">NominatimException</a></li>
-                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-                    
-                    <ul>
-                                                    <li class="interface"><a href="../classes/maxh.Nominatim.QueryInterface.html">QueryInterface</a></li>
-                                                                            <li class="trait"><a href="../classes/maxh.Nominatim.QueryTrait.html">QueryTrait</a></li>
-                                                                            <li class="class"><a href="../classes/maxh.Nominatim.Nominatim.html">Nominatim</a></li>
-                                                    <li class="class"><a href="../classes/maxh.Nominatim.Reverse.html">Reverse</a></li>
-                                                    <li class="class"><a href="../classes/maxh.Nominatim.Search.html">Search</a></li>
-                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-                    
-                    <ul>
-                                                                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-                    
-                    <ul>
-                                                                                            </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-        </div>
-    </section>
-    <section class="row-fluid">
-        <div class="span10 offset2">
-            <div class="row-fluid">
-                <div class="span8 content file">
-                    <nav>
-                                                                    </nav>
-
-                    <a href="#source-view" role="button" class="pull-right btn" data-toggle="modal"><i class="icon-code"></i></a>
-                    <h1><small></small>QueryTrait.php</h1>
-                    <p><em>Trait QueryTrait</em></p>
-                    
-
-                                        <h2>Traits</h2>
-                    <table class="table table-hover">
-                                                    <tr>
-                                <td><a href="../classes/maxh.Nominatim.QueryTrait.html">QueryTrait</a></td>
-                                <td><em>Trait implementing functionality common to requests nominatim.</em></td>
-                            </tr>
-                                            </table>
-                    
-                    
-                                    </div>
-
-                <aside class="span4 detailsbar">
-                    <dl>
-                                                    <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
-                        
-                        
-                    </dl>
-                    <h2>Tags</h2>
-                    <table class="table table-condensed">
-                                                    <tr>
-                                <th>
-                                    author
-                                </th>
-                                <td>
-                                                                            <p>Maxime Hélias <a href="mailto:maximehelias16@gmail.com">maximehelias16@gmail.com</a></p>
-                                                                    </td>
-                            </tr>
-                                            </table>
-
-                </aside>
-            </div>
-
-            
-            
-        </div>
-    </section>
-
-    <div id="source-view" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="source-view-label" aria-hidden="true">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="source-view-label"></h3>
-        </div>
-        <div class="modal-body">
-            <pre data-src="../files/QueryTrait.php.txt" class="language-php line-numbers"></pre>
-        </div>
-    </div>
-
-    <footer class="row-fluid">
-        <section class="span10 offset2">
-            <section class="row-fluid">
-                <section class="span10 offset1">
-                    <section class="row-fluid footer-sections">
-                        <section class="span4">
-                                                        <h1><i class="icon-code"></i></h1>
-                            <div>
-                                <ul>
-                                                                            <li><a href="../namespaces/maxh.html">\maxh</a></li>
-                                                                    </ul>
-                            </div>
-                        </section>
-                        <section class="span4">
-                                                        <h1><i class="icon-bar-chart"></i></h1>
-                            <div>
-                                <ul>
-                                    <li><a href="../graphs/class.html">Class Hierarchy Diagram</a></li>
-                                </ul>
-                            </div>
-                        </section>
-                        <section class="span4">
-                                                        <h1><i class="icon-pushpin"></i></h1>
-                            <div>
-                                <ul>
-                                    <li><a href="../reports/errors.html">Errors</a></li>
-                                    <li><a href="../reports/markers.html">Markers</a></li>
-                                </ul>
-                            </div>
-                        </section>
-                    </section>
-                </section>
-            </section>
-            <section class="row-fluid">
-                <section class="span10 offset1">
-                    <hr />
-                    Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 6th, 2017 at 19:50.
-                </section>
-            </section>
-        </section>
-    </footer>
-</div>
-
-</body>
-</html>
diff --git a/docs/files/QueryTrait.php.txt b/docs/files/QueryTrait.php.txt
deleted file mode 100644
index 222752a..0000000
--- a/docs/files/QueryTrait.php.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Trait QueryTrait
- *
- * @package      maxh\nominatim
- * @author       Maxime Hélias <maximehelias16@gmail.com>
- */
-
-namespace maxh\Nominatim;
-
-/**
- * Trait implementing functionality common to requests nominatim.
- */
-trait QueryTrait
-{
-	/**
-	 * Contain the path of the request
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * Contain the query for request
-	 * @var array
-	 */
-	protected $query = [];
-
-	/**
-	 * Contain the format for decode data returning by the request
-	 * @var string
-	 */
-	protected $format;
-
-	/**
-	 * Get path
-	 * @return string
-	 */
-	public function getPath()
-	{
-		return $this->path;
-	}
-
-	/**
-	 * Get query
-	 * @return array
-	 */
-	public function getQuery()
-	{
-		return $this->query;
-	}
-
-	/**
-	 * Get format
-	 * @return string
-	 */
-	public function getFormat()
-	{
-		return $this->format;
-	}
-
-	/**
-	 * Set path
-	 * @param string $path Name's path of the service
-	 */
-	private function setPath($path)
-	{
-		$this->path = $path;
-	}
-
-	/**
-	 * Set query
-	 * @param array $query Parameter of the query
-	 */
-	private function setQuery($query = array())
-	{
-		$this->query = $query;
-	}
-
-	/**
-	 * Set format
-	 * @param string $format Format returning by the response
-	 */
-	private function setFormat($format)
-	{
-		$this->format = $format;
-	}
-
-	/**
-	 * Returns the URL-encoded query.
-	 *
-	 * @return string
-	 */
-	public function getQueryString()
-	{
-		return http_build_query($this->query);
-	}
-}
-
diff --git a/docs/files/Reverse.html b/docs/files/Reverse.html
index 2210089..96d780e 100644
--- a/docs/files/Reverse.html
+++ b/docs/files/Reverse.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-427745013"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1129940085"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-427745013" class="accordion-body collapse in">
+            <div id="namespace-1129940085" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1774730800"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1721852758"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1774730800" class="accordion-body collapse ">
+            <div id="namespace-1721852758" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2015351466"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1119137762"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-2015351466" class="accordion-body collapse ">
+            <div id="namespace-1119137762" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-573726334"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1682964874"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-573726334" class="accordion-body collapse ">
+            <div id="namespace-1682964874" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -245,7 +245,7 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
@@ -316,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Reverse.php.txt b/docs/files/Reverse.php.txt
index 4cb7e32..3d04939 100644
--- a/docs/files/Reverse.php.txt
+++ b/docs/files/Reverse.php.txt
@@ -2,7 +2,7 @@
 /**
  * Class Reverse
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -46,9 +46,9 @@ class Reverse extends Query
      * @return \maxh\Nominatim\Reverse
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  if osm type is not supported
      */
-    public function osmType($type)
+    public function osmType(string $type): Reverse
     {
-        if (in_array($type, $this->osmType, true)) {
+        if (\in_array($type, $this->osmType, true)) {
             $this->query['osm_type'] = $type;
 
             return $this;
@@ -64,7 +64,7 @@ class Reverse extends Query
      *
      * @return \maxh\Nominatim\Reverse
      */
-    public function osmId($id)
+    public function osmId(int $id): Reverse
     {
         $this->query['osm_id'] = $id;
 
@@ -79,7 +79,7 @@ class Reverse extends Query
      *
      * @return \maxh\Nominatim\Reverse
      */
-    public function latlon($lat, $lon)
+    public function latlon(float $lat, float $lon): Reverse
     {
         $this->query['lat'] = $lat;
 
@@ -95,7 +95,7 @@ class Reverse extends Query
      *
      * @return \maxh\Nominatim\Reverse
      */
-    public function zoom($zoom)
+    public function zoom(int $zoom): Reverse
     {
         $this->query['zoom'] = (string) $zoom;
 
diff --git a/docs/files/Search.html b/docs/files/Search.html
index 72d63c8..99296b6 100644
--- a/docs/files/Search.html
+++ b/docs/files/Search.html
@@ -144,37 +144,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-793217276"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-4960345"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-793217276" class="accordion-body collapse in">
+            <div id="namespace-4960345" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1688697544"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-714285423"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-1688697544" class="accordion-body collapse ">
+            <div id="namespace-714285423" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1333591240"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1952190802"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1333591240" class="accordion-body collapse ">
+            <div id="namespace-1952190802" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1156552794"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-100642217"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1156552794" class="accordion-body collapse ">
+            <div id="namespace-100642217" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -245,7 +245,7 @@ <h2>Classes</h2>
                 <aside class="span4 detailsbar">
                     <dl>
                                                     <dt>Package</dt>
-                            <dd><div class="namespace-wrapper">\maxh\nominatim</div></dd>
+                            <dd><div class="namespace-wrapper">\maxh\Nominatim</div></dd>
                         
                         
                     </dl>
@@ -316,7 +316,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/files/Search.php.txt b/docs/files/Search.php.txt
index b9d9759..2741b9d 100644
--- a/docs/files/Search.php.txt
+++ b/docs/files/Search.php.txt
@@ -2,7 +2,7 @@
 /**
  * Class Search
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -28,8 +28,8 @@ class Search extends Query
 
         $this->setPath('search');
 
-        $this->accepteFormat[] = 'html';
-        $this->accepteFormat[] = 'jsonv2';
+        $this->acceptedFormat[] = 'html';
+        $this->acceptedFormat[] = 'jsonv2';
     }
 
     // -- Builder methods ------------------------------------------------------
@@ -41,7 +41,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function query($query)
+    public function query(string $query): Search
     {
         $this->query['q'] = $query;
 
@@ -57,7 +57,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function street($street)
+    public function street(string $street): Search
     {
         $this->query['street'] = $street;
 
@@ -73,7 +73,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function city($city)
+    public function city(string $city): Search
     {
         $this->query['city'] = $city;
 
@@ -89,7 +89,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function county($county)
+    public function county(string $county): Search
     {
         $this->query['county'] = $county;
 
@@ -105,7 +105,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function state($state)
+    public function state(string $state): Search
     {
         $this->query['state'] = $state;
 
@@ -121,7 +121,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function country($country)
+    public function country(string $country): Search
     {
         $this->query['country'] = $country;
 
@@ -133,11 +133,11 @@ class Search extends Query
      *
      * Do not combine with query().
      *
-     * @param  integer $postalCode The postal code
+     * @param  string $postalCode The postal code
      *
      * @return \maxh\Nominatim\Search
      */
-    public function postalCode($postalCode)
+    public function postalCode(string $postalCode): Search
     {
         $this->query['postalcode'] = $postalCode;
 
@@ -155,7 +155,7 @@ class Search extends Query
      * @return \maxh\Nominatim\Search
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException if country code is invalid
      */
-    public function countryCode($countrycode)
+    public function countryCode(string $countrycode): Search
     {
         if (!preg_match('/^[a-z]{2}$/i', $countrycode)) {
             throw new InvalidParameterException("Invalid country code: \"$countrycode\"");
@@ -180,7 +180,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function viewBox($left, $top, $right, $bottom)
+    public function viewBox(string $left, string $top, string $right, string $bottom): Search
     {
         $this->query['viewbox'] = $left . ',' . $top . ',' . $right . ',' . $bottom;
 
@@ -193,9 +193,9 @@ class Search extends Query
      * @return \maxh\Nominatim\Search
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  if no place id
      */
-    public function exludePlaceIds()
+    public function exludePlaceIds(): Search
     {
-        $args = func_get_args();
+        $args = \func_get_args();
 
         if (count($args) > 0) {
             $this->query['exclude_place_ids'] = implode(', ', $args);
@@ -213,7 +213,7 @@ class Search extends Query
      *
      * @return \maxh\Nominatim\Search
      */
-    public function limit($limit)
+    public function limit(int $limit): Search
     {
         $this->query['limit'] = (string) $limit;
 
diff --git a/docs/font/FontAwesome.otf b/docs/font/FontAwesome.otf
index 244f2b0d15fe885439cfe9d8bb380b5281879164..3461e3fce6a37f2321ecbe64707f04c0a4f05424 100644
GIT binary patch
delta 22
ecmdmVnq|vrmJJF^7<nfvEZNV<yZQc-%MAc=ZwfR3

delta 18
acmdmTnq|{zmJJF^CMz!4zxm;k%MAcpcM2N-

diff --git a/docs/font/fontawesome-webfont.ttf b/docs/font/fontawesome-webfont.ttf
index 8c5b30008915f6508b830f35d296103302a7ec4c..5cd6cff6d6f6cf438a882e366420dbcc5dddd3f1 100644
GIT binary patch
delta 220
zcmaEOk>k%rjt!RVjJ%sI*<E88c_-H;w*WazDejy=j%TjY=B(VG0zi@Ex<+mw^`!HT
z8c^cEhNVDG>c%UKK+1Bn10Rs8Jh;&YNNN3hz{JQqU6GMdbh|twqb8K2v%Q3wQB)Ep
zGf#%mSdfu-`$b(wDWJLAUt2KlWC7AkY#GbhfV8v=qZixu6fZ_LW*{%im+`3(koHet
oyd(^y6-yX3?SQn`CPr5!Al-k3G0XsH^ivil1t6D|mFbQ$0CQA7TmS$7

delta 164
zcmV;V09*h3(Fozu2(UQ^vpNSwT$6xfgp+_{6|)*-G6|DSZ6dR9ZTJwgX?}qVv+If6
zCX>jprL%6a)B&?Yvp^2Bgu$^qvo`+V0=E|d0X_nkE&%~7w}Jx!6&bgf905oXx8W@T
z8Vk4lI03l?x3)b2cLujEL;*?$w|Pnd1p~K#O#$T+w`E`f(i68hbO9+ow_>sZMIyJT
S)B#p7m;VF;Ah#d|0^B3%Mn7@@

diff --git a/docs/font/fontawesome-webfont.woff b/docs/font/fontawesome-webfont.woff
index b5c8b1fc853055c85043f47b2ec335e757172556..9eaecb37996e205f1027fce2df59fbaa500657a8 100644
GIT binary patch
delta 16
WcmZ4A$GQQC4!vdM-F)b6ZX^IhR|p#b

delta 14
Wcmdnc$GX0cb;F^zn-9OujRXKWKL`#0

diff --git a/docs/graphs/class.html b/docs/graphs/class.html
index 6df3228..2d41ef5 100644
--- a/docs/graphs/class.html
+++ b/docs/graphs/class.html
@@ -161,7 +161,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/graphs/classes.svg b/docs/graphs/classes.svg
index c9944f7..4e6a496 100644
--- a/docs/graphs/classes.svg
+++ b/docs/graphs/classes.svg
@@ -1,104 +1,124 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 2.38.0 (20140413.2041)
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: G Pages: 1 -->
-<svg width="604pt" height="500pt"
- viewBox="0.00 0.00 604.49 500.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 496)">
+<svg width="595pt" height="496pt"
+ viewBox="0.00 0.00 595.45 496.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 492)">
 <title>G</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-496 600.493,-496 600.493,4 -4,4"/>
-<g id="clust1" class="cluster"><title>cluster_Global</title>
-<path fill="none" stroke="gray" d="M20,-44C20,-44 576.493,-44 576.493,-44 582.493,-44 588.493,-50 588.493,-56 588.493,-56 588.493,-472 588.493,-472 588.493,-478 582.493,-484 576.493,-484 576.493,-484 20,-484 20,-484 14,-484 8,-478 8,-472 8,-472 8,-56 8,-56 8,-50 14,-44 20,-44"/>
-<text text-anchor="middle" x="298.246" y="-471.2" font-family="Times New Roman,serif" font-size="11.00" fill="gray">Global</text>
-</g>
-<g id="clust2" class="cluster"><title>cluster_\maxh</title>
-<path fill="none" stroke="gray" d="M28,-52C28,-52 568.493,-52 568.493,-52 574.493,-52 580.493,-58 580.493,-64 580.493,-64 580.493,-444 580.493,-444 580.493,-450 574.493,-456 568.493,-456 568.493,-456 28,-456 28,-456 22,-456 16,-450 16,-444 16,-444 16,-64 16,-64 16,-58 22,-52 28,-52"/>
-<text text-anchor="middle" x="298.246" y="-443.2" font-family="Times New Roman,serif" font-size="11.00" fill="gray">maxh</text>
-</g>
-<g id="clust3" class="cluster"><title>cluster_\maxh\Nominatim</title>
-<path fill="none" stroke="gray" d="M36,-60C36,-60 560.493,-60 560.493,-60 566.493,-60 572.493,-66 572.493,-72 572.493,-72 572.493,-416 572.493,-416 572.493,-422 566.493,-428 560.493,-428 560.493,-428 36,-428 36,-428 30,-428 24,-422 24,-416 24,-416 24,-72 24,-72 24,-66 30,-60 36,-60"/>
-<text text-anchor="middle" x="298.246" y="-415.2" font-family="Times New Roman,serif" font-size="11.00" fill="gray">Nominatim</text>
-</g>
-<g id="clust4" class="cluster"><title>cluster_\maxh\Nominatim\Exceptions</title>
-<path fill="none" stroke="gray" d="M375.493,-68C375.493,-68 552.493,-68 552.493,-68 558.493,-68 564.493,-74 564.493,-80 564.493,-80 564.493,-182 564.493,-182 564.493,-188 558.493,-194 552.493,-194 552.493,-194 375.493,-194 375.493,-194 369.493,-194 363.493,-188 363.493,-182 363.493,-182 363.493,-80 363.493,-80 363.493,-74 369.493,-68 375.493,-68"/>
-<text text-anchor="middle" x="463.993" y="-181.2" font-family="Times New Roman,serif" font-size="11.00" fill="gray">Exceptions</text>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-492 591.4526,-492 591.4526,4 -4,4"/>
+<g id="clust1" class="cluster">
+<title>cluster_Global</title>
+<path fill="none" stroke="#c0c0c0" d="M20,-44C20,-44 567.4526,-44 567.4526,-44 573.4526,-44 579.4526,-50 579.4526,-56 579.4526,-56 579.4526,-468 579.4526,-468 579.4526,-474 573.4526,-480 567.4526,-480 567.4526,-480 20,-480 20,-480 14,-480 8,-474 8,-468 8,-468 8,-56 8,-56 8,-50 14,-44 20,-44"/>
+<text text-anchor="middle" x="293.7263" y="-467.2" font-family="Times,serif" font-size="11.00" fill="#c0c0c0">Global</text>
+</g>
+<g id="clust2" class="cluster">
+<title>cluster_\maxh</title>
+<path fill="none" stroke="#c0c0c0" d="M28,-52C28,-52 559.4526,-52 559.4526,-52 565.4526,-52 571.4526,-58 571.4526,-64 571.4526,-64 571.4526,-441 571.4526,-441 571.4526,-447 565.4526,-453 559.4526,-453 559.4526,-453 28,-453 28,-453 22,-453 16,-447 16,-441 16,-441 16,-64 16,-64 16,-58 22,-52 28,-52"/>
+<text text-anchor="middle" x="293.7263" y="-440.2" font-family="Times,serif" font-size="11.00" fill="#c0c0c0">maxh</text>
+</g>
+<g id="clust3" class="cluster">
+<title>cluster_\maxh\Nominatim</title>
+<path fill="none" stroke="#c0c0c0" d="M36,-60C36,-60 551.4526,-60 551.4526,-60 557.4526,-60 563.4526,-66 563.4526,-72 563.4526,-72 563.4526,-414 563.4526,-414 563.4526,-420 557.4526,-426 551.4526,-426 551.4526,-426 36,-426 36,-426 30,-426 24,-420 24,-414 24,-414 24,-72 24,-72 24,-66 30,-60 36,-60"/>
+<text text-anchor="middle" x="293.7263" y="-413.2" font-family="Times,serif" font-size="11.00" fill="#c0c0c0">Nominatim</text>
+</g>
+<g id="clust4" class="cluster">
+<title>cluster_\maxh\Nominatim\Exceptions</title>
+<path fill="none" stroke="#c0c0c0" d="M370.4258,-68C370.4258,-68 543.4526,-68 543.4526,-68 549.4526,-68 555.4526,-74 555.4526,-80 555.4526,-80 555.4526,-181 555.4526,-181 555.4526,-187 549.4526,-193 543.4526,-193 543.4526,-193 370.4258,-193 370.4258,-193 364.4258,-193 358.4258,-187 358.4258,-181 358.4258,-181 358.4258,-80 358.4258,-80 358.4258,-74 364.4258,-68 370.4258,-68"/>
+<text text-anchor="middle" x="456.9392" y="-180.2" font-family="Times,serif" font-size="11.00" fill="#c0c0c0">Exceptions</text>
 </g>
 <!-- \\maxh\\Nominatim\\Exceptions\\NominatimException -->
-<g id="node1" class="node"><title>\\maxh\\Nominatim\\Exceptions\\NominatimException</title>
-<polygon fill="none" stroke="black" points="532.993,-166 394.993,-166 394.993,-130 532.993,-130 532.993,-166"/>
-<text text-anchor="middle" x="463.993" y="-145.2" font-family="Courier,monospace" font-size="11.00">NominatimException</text>
+<g id="node1" class="node">
+<title>\\maxh\\Nominatim\\Exceptions\\NominatimException</title>
+<polygon fill="none" stroke="#000000" points="524.2587,-166 389.6198,-166 389.6198,-130 524.2587,-130 524.2587,-166"/>
+<text text-anchor="middle" x="456.9392" y="-144.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">NominatimException</text>
 </g>
 <!-- \\Exception -->
-<g id="node9" class="node"><title>\\Exception</title>
-<ellipse fill="none" stroke="black" cx="257.246" cy="-18" rx="42.4939" ry="18"/>
-<text text-anchor="middle" x="257.246" y="-14.3" font-family="Times New Roman,serif" font-size="14.00" fill="gray">xception</text>
+<g id="node9" class="node">
+<title>\\Exception</title>
+<ellipse fill="none" stroke="#000000" cx="253.4204" cy="-18" rx="40.6162" ry="18"/>
+<text text-anchor="middle" x="253.4204" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#c0c0c0">xception</text>
 </g>
 <!-- \\maxh\\Nominatim\\Exceptions\\NominatimException&#45;&gt;\\Exception -->
-<g id="edge4" class="edge"><title>\\maxh\\Nominatim\\Exceptions\\NominatimException&#45;&gt;\\Exception</title>
-<path fill="none" stroke="black" d="M394.941,-134.72C384.022,-131.145 373.15,-126.646 363.493,-121 328.493,-100.537 328.632,-84.1879 299.493,-56 294.509,-51.1788 289.105,-46.0991 283.902,-41.2779"/>
-<polygon fill="none" stroke="black" points="286.222,-38.6561 276.494,-34.4594 281.481,-43.8067 286.222,-38.6561"/>
+<g id="edge2" class="edge">
+<title>\\maxh\\Nominatim\\Exceptions\\NominatimException&#45;&gt;\\Exception</title>
+<path fill="none" stroke="#000000" d="M389.5618,-134.6511C378.7514,-131.0844 367.987,-126.6063 358.4258,-121 323.4526,-100.4932 323.5239,-84.2304 294.4258,-56 289.4646,-51.1867 284.0902,-46.1106 278.9165,-41.2903"/>
+<polygon fill="none" stroke="#000000" points="281.2673,-38.697 271.5515,-34.4716 276.5117,-43.8336 281.2673,-38.697"/>
 </g>
 <!-- \\maxh\\Nominatim\\Exceptions\\InvalidParameterException -->
-<g id="node2" class="node"><title>\\maxh\\Nominatim\\Exceptions\\InvalidParameterException</title>
-<polygon fill="none" stroke="black" points="556.493,-112 371.493,-112 371.493,-76 556.493,-76 556.493,-112"/>
-<text text-anchor="middle" x="463.993" y="-91.2" font-family="Courier,monospace" font-size="11.00">InvalidParameterException</text>
+<g id="node2" class="node">
+<title>\\maxh\\Nominatim\\Exceptions\\InvalidParameterException</title>
+<polygon fill="none" stroke="#000000" points="547.4661,-112 366.4124,-112 366.4124,-76 547.4661,-76 547.4661,-112"/>
+<text text-anchor="middle" x="456.9392" y="-90.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">InvalidParameterException</text>
 </g>
 <!-- \\maxh\\Nominatim\\Exceptions\\InvalidParameterException&#45;&gt;\\Exception -->
-<g id="edge6" class="edge"><title>\\maxh\\Nominatim\\Exceptions\\InvalidParameterException&#45;&gt;\\Exception</title>
-<path fill="none" stroke="black" d="M414.47,-75.9891C379.276,-62.925 332.21,-45.4545 298.966,-33.1148"/>
-<polygon fill="none" stroke="black" points="300.143,-29.8184 289.55,-29.6197 297.707,-36.3809 300.143,-29.8184"/>
-</g>
-<!-- \\maxh\\Nominatim\\Query -->
-<g id="node3" class="node"><title>\\maxh\\Nominatim\\Query</title>
-<polygon fill="none" stroke="black" points="284.246,-292 230.246,-292 230.246,-256 284.246,-256 284.246,-292"/>
-<text text-anchor="middle" x="257.246" y="-271.2" font-family="Courier,monospace" font-size="11.00">Query</text>
+<g id="edge3" class="edge">
+<title>\\maxh\\Nominatim\\Exceptions\\InvalidParameterException&#45;&gt;\\Exception</title>
+<path fill="none" stroke="#000000" d="M408.7081,-75.9891C373.8742,-62.9811 327.3416,-45.6044 294.3222,-33.2739"/>
+<polygon fill="none" stroke="#000000" points="295.129,-29.8392 284.5365,-29.6197 292.6802,-36.3969 295.129,-29.8392"/>
 </g>
-<!-- \\maxh\\Nominatim\\QueryInterface -->
-<g id="node8" class="node"><title>\\maxh\\Nominatim\\QueryInterface</title>
-<polygon fill="none" stroke="black" points="143,-292 32,-292 32,-256 143,-256 143,-292"/>
-<text text-anchor="middle" x="87.5" y="-271.2" font-family="Courier,monospace" font-size="11.00">QueryInterface</text>
+<!-- \\maxh\\Nominatim\\Lookup -->
+<g id="node3" class="node">
+<title>\\maxh\\Nominatim\\Lookup</title>
+<polygon fill="none" stroke="#000000" points="484.547,-291 429.3314,-291 429.3314,-255 484.547,-255 484.547,-291"/>
+<text text-anchor="middle" x="456.9392" y="-269.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">Lookup</text>
 </g>
-<!-- \\maxh\\Nominatim\\Query&#45;&gt;\\maxh\\Nominatim\\QueryInterface -->
-<g id="edge1" class="edge"><title>\\maxh\\Nominatim\\Query&#45;&gt;\\maxh\\Nominatim\\QueryInterface</title>
-<path fill="none" stroke="black" stroke-dasharray="1,5" d="M230.036,-274C209.527,-274 180.104,-274 153.391,-274"/>
-<polygon fill="none" stroke="black" points="153.31,-270.5 143.31,-274 153.31,-277.5 153.31,-270.5"/>
+<!-- \\maxh\\Nominatim\\Query -->
+<g id="node7" class="node">
+<title>\\maxh\\Nominatim\\Query</title>
+<polygon fill="none" stroke="#000000" points="294.4312,-345 212.4097,-345 212.4097,-309 294.4312,-309 294.4312,-345"/>
+<text text-anchor="start" x="220.415" y="-329.2" font-family="Courier,monospace" font-size="11.00" fill="#000000">«abstract»</text>
+<text text-anchor="start" x="236.9177" y="-318.2" font-family="Courier,monospace" font-size="11.00" fill="#000000">Query</text>
 </g>
-<!-- \\maxh\\Nominatim\\Nominatim -->
-<g id="node4" class="node"><title>\\maxh\\Nominatim\\Nominatim</title>
-<polygon fill="none" stroke="black" points="502.493,-346 425.493,-346 425.493,-310 502.493,-310 502.493,-346"/>
-<text text-anchor="middle" x="463.993" y="-325.2" font-family="Courier,monospace" font-size="11.00">Nominatim</text>
+<!-- \\maxh\\Nominatim\\Lookup&#45;&gt;\\maxh\\Nominatim\\Query -->
+<g id="edge1" class="edge">
+<title>\\maxh\\Nominatim\\Lookup&#45;&gt;\\maxh\\Nominatim\\Query</title>
+<path fill="none" stroke="#000000" d="M429.0675,-280.3952C397.0528,-288.8898 343.8684,-303.0013 304.3945,-313.475"/>
+<polygon fill="none" stroke="#000000" points="303.4433,-310.1061 294.6754,-316.0537 305.2386,-316.872 303.4433,-310.1061"/>
 </g>
 <!-- \\maxh\\Nominatim\\Search -->
-<g id="node5" class="node"><title>\\maxh\\Nominatim\\Search</title>
-<polygon fill="none" stroke="black" points="492.493,-238 435.493,-238 435.493,-202 492.493,-202 492.493,-238"/>
-<text text-anchor="middle" x="463.993" y="-217.2" font-family="Courier,monospace" font-size="11.00">Search</text>
+<g id="node4" class="node">
+<title>\\maxh\\Nominatim\\Search</title>
+<polygon fill="none" stroke="#000000" points="484.547,-399 429.3314,-399 429.3314,-363 484.547,-363 484.547,-399"/>
+<text text-anchor="middle" x="456.9392" y="-377.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">Search</text>
 </g>
 <!-- \\maxh\\Nominatim\\Search&#45;&gt;\\maxh\\Nominatim\\Query -->
-<g id="edge2" class="edge"><title>\\maxh\\Nominatim\\Search&#45;&gt;\\maxh\\Nominatim\\Query</title>
-<path fill="none" stroke="black" d="M435.38,-227.283C398.852,-236.916 334.404,-253.914 294.137,-264.534"/>
-<polygon fill="none" stroke="black" points="293.229,-261.154 284.452,-267.088 295.014,-267.922 293.229,-261.154"/>
+<g id="edge4" class="edge">
+<title>\\maxh\\Nominatim\\Search&#45;&gt;\\maxh\\Nominatim\\Query</title>
+<path fill="none" stroke="#000000" d="M429.0675,-373.6048C397.0528,-365.1102 343.8684,-350.9987 304.3945,-340.525"/>
+<polygon fill="none" stroke="#000000" points="305.2386,-337.128 294.6754,-337.9463 303.4433,-343.8939 305.2386,-337.128"/>
+</g>
+<!-- \\maxh\\Nominatim\\Nominatim -->
+<g id="node5" class="node">
+<title>\\maxh\\Nominatim\\Nominatim</title>
+<polygon fill="none" stroke="#000000" points="494.85,-237 419.0284,-237 419.0284,-201 494.85,-201 494.85,-237"/>
+<text text-anchor="middle" x="456.9392" y="-215.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">Nominatim</text>
 </g>
 <!-- \\maxh\\Nominatim\\Reverse -->
-<g id="node6" class="node"><title>\\maxh\\Nominatim\\Reverse</title>
-<polygon fill="none" stroke="black" points="495.993,-400 431.993,-400 431.993,-364 495.993,-364 495.993,-400"/>
-<text text-anchor="middle" x="463.993" y="-379.2" font-family="Courier,monospace" font-size="11.00">Reverse</text>
+<g id="node6" class="node">
+<title>\\maxh\\Nominatim\\Reverse</title>
+<polygon fill="none" stroke="#000000" points="488.1471,-345 425.7313,-345 425.7313,-309 488.1471,-309 488.1471,-345"/>
+<text text-anchor="middle" x="456.9392" y="-323.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">Reverse</text>
 </g>
 <!-- \\maxh\\Nominatim\\Reverse&#45;&gt;\\maxh\\Nominatim\\Query -->
-<g id="edge3" class="edge"><title>\\maxh\\Nominatim\\Reverse&#45;&gt;\\maxh\\Nominatim\\Query</title>
-<path fill="none" stroke="black" d="M431.828,-376.803C411.626,-372.659 385.139,-365.737 363.493,-355 333.952,-340.347 304.571,-316.787 284.39,-298.844"/>
-<polygon fill="none" stroke="black" points="286.624,-296.145 276.861,-292.029 281.926,-301.335 286.624,-296.145"/>
+<g id="edge5" class="edge">
+<title>\\maxh\\Nominatim\\Reverse&#45;&gt;\\maxh\\Nominatim\\Query</title>
+<path fill="none" stroke="#000000" d="M425.5854,-327C393.4809,-327 343.0376,-327 305.0348,-327"/>
+<polygon fill="none" stroke="#000000" points="304.6716,-323.5001 294.6715,-327 304.6715,-330.5001 304.6716,-323.5001"/>
 </g>
-<!-- \\maxh\\Nominatim\\Lookup -->
-<g id="node7" class="node"><title>\\maxh\\Nominatim\\Lookup</title>
-<polygon fill="none" stroke="black" points="492.493,-292 435.493,-292 435.493,-256 492.493,-256 492.493,-292"/>
-<text text-anchor="middle" x="463.993" y="-271.2" font-family="Courier,monospace" font-size="11.00">Lookup</text>
+<!-- \\maxh\\Nominatim\\QueryInterface -->
+<g id="node8" class="node">
+<title>\\maxh\\Nominatim\\QueryInterface</title>
+<polygon fill="none" stroke="#000000" points="140.6234,-345 31.7917,-345 31.7917,-309 140.6234,-309 140.6234,-345"/>
+<text text-anchor="middle" x="86.2075" y="-323.7" font-family="Courier,monospace" font-size="11.00" fill="#000000">QueryInterface</text>
 </g>
-<!-- \\maxh\\Nominatim\\Lookup&#45;&gt;\\maxh\\Nominatim\\Query -->
-<g id="edge5" class="edge"><title>\\maxh\\Nominatim\\Lookup&#45;&gt;\\maxh\\Nominatim\\Query</title>
-<path fill="none" stroke="black" d="M435.38,-274C399.007,-274 334.95,-274 294.65,-274"/>
-<polygon fill="none" stroke="black" points="294.452,-270.5 284.452,-274 294.452,-277.5 294.452,-270.5"/>
+<!-- \\maxh\\Nominatim\\Query&#45;&gt;\\maxh\\Nominatim\\QueryInterface -->
+<g id="edge6" class="edge">
+<title>\\maxh\\Nominatim\\Query&#45;&gt;\\maxh\\Nominatim\\QueryInterface</title>
+<path fill="none" stroke="#000000" stroke-dasharray="1,5" d="M212.0869,-327C193.6372,-327 171.4605,-327 150.8954,-327"/>
+<polygon fill="none" stroke="#000000" points="150.6358,-323.5001 140.6358,-327 150.6357,-330.5001 150.6358,-323.5001"/>
 </g>
 </g>
 </svg>
diff --git a/docs/images/apple-touch-icon-114x114.png b/docs/images/apple-touch-icon-114x114.png
index 22a98838bf075d6c736cf57ba4816828f4d3fb23..1506f6a668fbb2837c06b561895da248c310ac53 100644
GIT binary patch
delta 23
fcmdmRmvPfwM%K;%KX=}ZEN8hGc{g9=x}OXHa0&?t

delta 20
ccmdmVmvO^gMwZS1KlhESXSp_C=DME@0A5oF@Bjb+

diff --git a/docs/images/apple-touch-icon-72x72.png b/docs/images/apple-touch-icon-72x72.png
index d1e90331e924fd5bf2a1449af4fd314ce2869ffd..d813259bf412e9556f9084f1496d60bfdb24a9de 100644
GIT binary patch
delta 14
VcmX??d_I}AGr-TCcO%OwLjW#w1(W~)

delta 13
UcmX?~d@h-#Gr-S%BkL(c04i4nhX4Qo

diff --git a/docs/images/apple-touch-icon.png b/docs/images/apple-touch-icon.png
index ac2e828140d67f2d0a030d2c3a6dc5af3c97694f..2d320cb5e1215894ef37cf8c6fd7a0085eba06f3 100644
GIT binary patch
delta 14
VcmZ4LxXh8YGr-TCcO%O}1pp?t1jGOU

delta 13
UcmZ4HxYUuQGr-S%BkMv103$F2w*UYD

diff --git a/docs/images/hierarchy-item.png b/docs/images/hierarchy-item.png
index f96dc36d90b32a9cd4a6e9959ce2336b9263d370..c7756e75ac9fc933cbd3b26d0f2817d33857d15b 100644
GIT binary patch
delta 13
UcmaFO_=b_SGr-TCcOuJk03zrF)&Kwi

delta 12
TcmaFE_?nTWGr-S%BI|PiA7cc`

diff --git a/docs/images/icon-class-13x13.png b/docs/images/icon-class-13x13.png
index cf202c359ebd0fca078a958fea7957e650ec258f..731f0bd3834c59763eab2237c17a8377a806e3b4 100644
GIT binary patch
delta 14
VcmZ3@yoQ;zGr-TCcO%PkMgSpi1Umo#

delta 13
UcmZ3(yqcM%Gr-S%BkOWT03KNcE&u=k

diff --git a/docs/images/icon-interface-13x13.png b/docs/images/icon-interface-13x13.png
index 9a87664464a2551539c2d7b759c45e779dee9c04..aa24fa96a487f029b3d4ce8c94d363450d4d17f2 100644
GIT binary patch
delta 14
VcmdnYw1tVaGr-TCcO#2FBLE>c1JM8g

delta 13
UcmdnOw3&&eGr-S%Bdb0m03H(q!~g&Q

diff --git a/docs/images/icon-trait-13x13.png b/docs/images/icon-trait-13x13.png
index 0192cfb578c76a423f57d0ad589c3426ad158c60..3c2792b1b1bd6b2ffed9fa34e05db2b7405c1503 100644
GIT binary patch
delta 14
Vcmcc2bcKnvGr-TCcO#2GBLF0~1Tg>r

delta 13
Ucmcb@beV~zGr-S%Bdb3n03lNZBme*a

diff --git a/docs/images/iviewer/iviewer.rotate_left.png b/docs/images/iviewer/iviewer.rotate_left.png
index c4a35a321224be86dd8349a19225f0fdb9b0a7f7..df0956de95c807706117f9f63b9653ad7ba4e844 100644
GIT binary patch
delta 14
Vcmcb@eU+QFGr-TCcO%OMRsbfi1j+ya

delta 13
Ucmcc0eTAE)Gr-S%BkKiL03$a9y#N3J

diff --git a/docs/images/iviewer/iviewer.rotate_right.png b/docs/images/iviewer/iviewer.rotate_right.png
index a89adc1404c51c26a006e3346b05a5218742310f..7a6c829871d058af5a5ca0ac67256c259f84c5ac 100644
GIT binary patch
delta 21
dcmX@XeTtj4Gr-TCcO%O;W=7u4znIT40sv7E2V?*M

delta 18
acmX@beS({%Gr-S%BkMQj&3~BBF#-TXbq7lT

diff --git a/docs/images/iviewer/iviewer.zoom_fit.png b/docs/images/iviewer/iviewer.zoom_fit.png
index 3a65af572963953b1dc502fafddaddc0ea51d48a..364e01d90eae19584713851314629f2468198e9e 100644
GIT binary patch
delta 14
VcmaFN`Gk|TGr-TCcO%Pv762$B1o8j?

delta 13
UcmaFD`IwWXGr-S%BkO$@03?tE<p2Nx

diff --git a/docs/images/iviewer/iviewer.zoom_in.png b/docs/images/iviewer/iviewer.zoom_in.png
index 5cd801056c644de9836ff0cf8805312ba636466c..78993327c62ddd64e7fe33bc1b0d469ef9e17f30 100644
GIT binary patch
delta 14
VcmeC??%`(b4DfU3-N@3;3IHCn1MdI;

delta 13
UcmeC-?&fCc4DfT`$lA^d02|E%;s5{u

diff --git a/docs/images/iviewer/iviewer.zoom_out.png b/docs/images/iviewer/iviewer.zoom_out.png
index 16b29793fe1d4bd0ced12b02faef13bf1a91f573..893f3502baaab667354fe8b560c1712b72630836 100644
GIT binary patch
delta 14
VcmZqY?%-za4DfU3-N@3+3IHBM1LFVy

delta 13
UcmeC+Zs%s{4DfT`$lA;b02^fk)&Kwi

diff --git a/docs/images/iviewer/iviewer.zoom_zero.png b/docs/images/iviewer/iviewer.zoom_zero.png
index 1a19a11a8056d9051a3fda65d20ad63266036e94..c981db6d690774d0c2e67e21c9081d5c89b5fd2d 100644
GIT binary patch
delta 14
VcmX@aahQX(Gr-TCcO#1(3jiZ-1PuTH

delta 13
UcmX@iafpMZGr-S%BdZ+?03aX)00000

diff --git a/docs/index.html b/docs/index.html
index b0d5082..223e078 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1546900594"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-250978100"></a>
                                 <a href="namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-1546900594" class="accordion-body collapse in">
+            <div id="namespace-250978100" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-320782728"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-481378438"></a>
                                 <a href="namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-320782728" class="accordion-body collapse ">
+            <div id="namespace-481378438" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1496697046"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-402346737"></a>
                                 <a href="namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1496697046" class="accordion-body collapse ">
+            <div id="namespace-402346737" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1017051409"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1957757236"></a>
                                 <a href="namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1017051409" class="accordion-body collapse ">
+            <div id="namespace-1957757236" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -243,7 +243,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/default.html b/docs/namespaces/default.html
index 2ea60e0..0be891b 100644
--- a/docs/namespaces/default.html
+++ b/docs/namespaces/default.html
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-616211538"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1787340099"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-616211538" class="accordion-body collapse in">
+            <div id="namespace-1787340099" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-561158512"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1053451490"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-561158512" class="accordion-body collapse ">
+            <div id="namespace-1053451490" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1877079583"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-338854634"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1877079583" class="accordion-body collapse ">
+            <div id="namespace-338854634" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1741965404"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-867185909"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1741965404" class="accordion-body collapse ">
+            <div id="namespace-867185909" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -243,7 +243,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/maxh.Nominatim.Exceptions.html b/docs/namespaces/maxh.Nominatim.Exceptions.html
index 4991d5e..0a7a85b 100644
--- a/docs/namespaces/maxh.Nominatim.Exceptions.html
+++ b/docs/namespaces/maxh.Nominatim.Exceptions.html
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-964126207"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1243093833"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-964126207" class="accordion-body collapse in">
+            <div id="namespace-1243093833" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-233272351"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1012425320"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-233272351" class="accordion-body collapse ">
+            <div id="namespace-1012425320" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-884124079"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-339564876"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-884124079" class="accordion-body collapse ">
+            <div id="namespace-339564876" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1264830028"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1338184382"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-1264830028" class="accordion-body collapse ">
+            <div id="namespace-1338184382" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -254,7 +254,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/maxh.Nominatim.html b/docs/namespaces/maxh.Nominatim.html
index 7f1b54a..e47617d 100644
--- a/docs/namespaces/maxh.Nominatim.html
+++ b/docs/namespaces/maxh.Nominatim.html
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-767827911"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-528395538"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-767827911" class="accordion-body collapse in">
+            <div id="namespace-528395538" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-608108979"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-498519441"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-608108979" class="accordion-body collapse ">
+            <div id="namespace-498519441" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1967647125"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-43231499"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-1967647125" class="accordion-body collapse ">
+            <div id="namespace-43231499" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-630614207"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-562136829"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-630614207" class="accordion-body collapse ">
+            <div id="namespace-562136829" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -277,7 +277,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/namespaces/maxh.html b/docs/namespaces/maxh.html
index dfaa223..4a15e63 100644
--- a/docs/namespaces/maxh.html
+++ b/docs/namespaces/maxh.html
@@ -96,37 +96,37 @@
                                 <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-802380135"></a>
+                                    <a class="accordion-toggle " data-toggle="collapse" data-target="#namespace-1724775023"></a>
                                 <a href="../namespaces/default.html" style="margin-left: 30px; padding-left: 0">\</a>
             </div>
-            <div id="namespace-802380135" class="accordion-body collapse in">
+            <div id="namespace-1724775023" class="accordion-body collapse in">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-407751382"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-853013478"></a>
                                 <a href="../namespaces/maxh.html" style="margin-left: 30px; padding-left: 0">maxh</a>
             </div>
-            <div id="namespace-407751382" class="accordion-body collapse ">
+            <div id="namespace-853013478" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-2074511769"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-1436250713"></a>
                                 <a href="../namespaces/maxh.Nominatim.html" style="margin-left: 30px; padding-left: 0">Nominatim</a>
             </div>
-            <div id="namespace-2074511769" class="accordion-body collapse ">
+            <div id="namespace-1436250713" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                                                     <div class="accordion" style="margin-bottom: 0">
         <div class="accordion-group">
             <div class="accordion-heading">
-                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-326412467"></a>
+                                    <a class="accordion-toggle collapsed" data-toggle="collapse" data-target="#namespace-502834264"></a>
                                 <a href="../namespaces/maxh.Nominatim.Exceptions.html" style="margin-left: 30px; padding-left: 0">Exceptions</a>
             </div>
-            <div id="namespace-326412467" class="accordion-body collapse ">
+            <div id="namespace-502834264" class="accordion-body collapse ">
                 <div class="accordion-inner">
 
                     
@@ -245,7 +245,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/phpdoc-cache-43/phpdoc-cache-file_f5f6b84906e89e213f2429162986526b.dat b/docs/phpdoc-cache-43/phpdoc-cache-file_f5f6b84906e89e213f2429162986526b.dat
index dc14f93bccd8a4ce8ba5f1f955972c98cf86a00b..4e04db3bc968947e46a30a4b81d9f46e26fb5089 100644
GIT binary patch
delta 1722
zcmb_dTSyd981|f5cXQj^*2}J?)+9ct2=468Uabc!j6%G1A#1@sJC3`9d$D!4w3O`r
zsN0W~kU=OZL|7a`=p_gOp~&hbB1nmdUJAAFr5+mBOPNIBHV-rNpa0DF{r~rWhZ%m4
zhri<9J*>lLwp)0cVD;H}r-O631dGq-;vIs}#9N(KA?~-R?7Z0-AK+1S{N=|q;%k$m
zM37nf06j#giFPobux-CcqC%k46C&*aPjw_Dg^4VMJoVynG1?}sTCa*kT4JrxqCRI-
z(4?@REo_cNLqslivvn~s+5vOwa^wL{!zv7Q8Yi<xhB|#d+}5V$EU^Sh*dHT)ahd0g
z$p{k}8hE39k_5&0dVQWR5(%<}O`=SsU>m!Gm7}p$G*qRVL~G~C6+;Sm(NZ&sXjLa=
z>G!w(WgJlF&xUTL>*@51g-d9ykzj{E5-!%V%5^GnpMR5@*&+|UtZz@EZYVWqH!bKR
z6aOE@@fvcIAsNWf{mT#@t#h*rJwrV6-OpeqD<68Zh{ny5Xq0roOxD@olG*2V%VH5Z
z0EToEn2pz9NM(RtlSc7TDts`4W^ogIR_DMot(smng&D-biwj1Ympiz@z`F~GAc(E9
z*i@NtJ&^WoFkLi;91uUSxpYOYpuElPa2KSMq=ZRGoR7F)zlSZ`_fdO^)`YB3QE?EC
z?aI_GOuwMKOL8l$v08YsH*>?{QB15_606Eq_2NM^hjL)FrW0zbQ|UxYKcZ8+4q(h#
zVPky*?WxqMvBe5r$x5GBHQ;2K=xB`>BNyFRKcZ3|UMYZ*g;a{4rTq;AA%2kSL-gCx
zODbf8Mv13m-knLq)6>2~7~43|*B^nN%3Ji6c!|LlZcVj+UsQRP!A_?lLK>n^Tl*O7
za;^!kc7Eh5=lF&0J|Q7&;}!I7Ov_FMFt+pm3w@4ub<-?tOPC{}26yEogY63jnd%?H
zjLU3SoO75?UawLyF3t{$bs+D?7JB;T1*H_Tl5C)jL!1gb%=0<=c;qdUw*1?GV=YIa
Z@!mL{xD!OE8n%zVR&i#Fjpp3d;~$JdaCra#

delta 910
zcmZ{gUr1AN6vzGjc6Dis4be@_$&`gFqjq=iy!TEtkW#YH9xU(==55~1k(*Ah^G}GP
zSUniH&O=44DKjL<8vIQ2A$o`+=nqo8^b!_5L@5{);ZxmBClm7b@caD^=X1{Yd(P}H
zJo^<-R-1U|1()64#`6p-GAwViih_$4c!A?wE*n?c7IfPvyTH)F5Q}`lci+e}^c0aX
z)f$G8f>g-Uoq+FY6?@FC&Tg+LAA|~Z84RjT<hGhu#fe_ZnAsuv+`Xb(vX~P;n99iq
zaqpW10wWr&*4!q^qNk(BRBn>Hd!-mdUT8j}1f-F?O4?$MKk*JnwToLeuE7IcK6$0<
z-=_6azuYa>i|!taSyt}kuJ1FA+uVMi=#`FdDqH?z0mieQKuz|Sv<#DSF2PStHq_~z
z$>9gRJ2`AIT!tTpd1QicPE@_M8dx_Nh@9(FLDvlf*~pLV(=m=B(dm@BWT`5?Js24-
zgk|FyC@675?Pwl^OVsAgR8d)vgL4$697>6~jYV`)H5@ChA^O7^2AHDL;nU1%((FHl
z$y8N6##RC7&|mWVq$?HE0tBNBnXGHT2@;z9bFezpM=I;R2+<1L08N1?SvnV1DWQU2
z54OOvqedynfQPpxV(sHauMY%BZi|Qz6S0O6MDJ2$xOI%eEE5;uq)N0y<o=OyveJGQ
zsaU}tx5Qn%qQX}DE*i=RGZZQ%C=jL)N2UioJKB-ep%sJ~Ym(tUL~2LdF=Amd%I@Ym
zHtN9Dg)D5d6FM|NVJ2<>rm85obEg32{f)5JSPd(UYFM9;i810rnCAcm8i+DEg?S#P
z2U*g3FM=^+iwy!B<z9FmEhabT{>0P^9V~RsS;%U1L6z?7^m=@v?D0a>-vsBEUXr(u
TIuP<f+2Ti)AaEq-u@?UWw(edk

diff --git a/docs/phpdoc-cache-4a/phpdoc-cache-file_d09f0f1f8734cca72644ca8f179729f5.dat b/docs/phpdoc-cache-4a/phpdoc-cache-file_d09f0f1f8734cca72644ca8f179729f5.dat
index 157e3bfff3660b855cc7b427ca4c4655325f1bc2..d70fb173e0b19415f38fd9592df95404c104a362 100644
GIT binary patch
delta 167
zcmexuHOYE{hkS~KaaxLzX<CYDl97R>d7`PAg<)Enk%?uhsfB5>>BMwfCS%Kq%aobY
z5+|ONVf35$Z1?0MCXvZI8Mkv-DHN9!W#*+%E?~-Hw^B$fDoU&bvZW?}VXA{mZZ2Xz
zDZ=Qt*+#;HiPJAXH#0A>Br|vNLSAuc6DuXpypq(Sw8Z38g}~C(qDnY-@<D#Z&G)3{
GG64W*AUV<i

delta 133
zcmbPa{o87ShrETcS*n3SVsfg9rE#j6K~j=wa+-OnxtUo~qJ?p?;ly-XCPRyf%akXc
zmSN1B_+mGU0uW4I%y@co8B^Be=S(v;w=<s<Va(ecDB;1xm^XQrl)R*om6B&(Nor9V
i&{&1Q($u0#FgH1M@&hi#$pYfylV$mYHp@wuFaZF)WGr|9

diff --git a/docs/phpdoc-cache-da/phpdoc-cache-file_c6aeec193347e8e093efabca75accd2e.dat b/docs/phpdoc-cache-5c/phpdoc-cache-file_fc97c9c8e82b0a7635ba87870608eb18.dat
similarity index 70%
rename from docs/phpdoc-cache-da/phpdoc-cache-file_c6aeec193347e8e093efabca75accd2e.dat
rename to docs/phpdoc-cache-5c/phpdoc-cache-file_fc97c9c8e82b0a7635ba87870608eb18.dat
index e900bb783983ba7194f462198a7b389a7b5ee71b..8457c3d6dcf2a9f02cbabddcbcb5b7cccbb80849 100644
GIT binary patch
delta 320
zcmeyRxJGq?yF#i_Qj(={l8FfrSz0Egnx&)~nj54Un3<)RnHpFaOiWi`)Svv9U2^hS
zUXF<?1(?kY3?}Z$jOJ3%QgA3pOwLYBPgMYe+{B8E7{C17%)G>s%v`X1VrfZ6ei1}k
z!8frYGdESi<M7Iy%*0{^8=!h1KO+^yGc<EZ&rQtC(M!(HwcD)3_@AB6$jG|b%G^qc
zL5razF@16%i__*p&K?#PLlY~d$yeA_Cd=}DnOw-Zml?!2;>zSSvr>ZCH(8O#k;~Ak
yI@8L)+TY4#av-w|S4d)dj3d}JlLfftk<?moOX->zS}76jy2%b)(UbRbp8x=+A!XbE

delta 110
zcmZ3Z`b%+wyMm>OrE!Y6saaY|a*}ysl0{mQrIDerp}BFgnSoJ?q3OhQg~>D6r6w+v
zU^X={o46-)b2H-~b|yp1&5fM5Sh&oslw4BN5=(PRCOdG5O>XA<!e})40_ScdiOmPN
Gl^Fq}@gxTT

diff --git a/docs/phpdoc-cache-7b/phpdoc-cache-file_3f6880af1291c36c4944ed54be016677.dat b/docs/phpdoc-cache-7b/phpdoc-cache-file_3f6880af1291c36c4944ed54be016677.dat
new file mode 100644
index 0000000000000000000000000000000000000000..36269a9f963ecfa1049657e24fae2ff750b5492d
GIT binary patch
literal 16790
zcmeHO+j84R63sKeVwR;!Nvg!+Rg$5^iOb1u@?ghhd-sV|sUbKdu_gfq7sZOB58Ch8
zAKTM&!vF+G$^=(QB)?b$1~Yx{(>*gkdHttedo^Eu7x~#zglQCyz7vTb2P^vX@4-Uk
zKigif=Y34P3$Ojz>1T7E%-dIq*YA1lX=mt*L4VNc4=%=+=lrQZ6@1X`c76Zp@M3sL
z<J4Cxo~p0<Ui<qGzF4I}6eee{qGb^BG+5eaPe2rX2J*025@oS3=y$I(JonmPeS_Dn
zv(wWSJ7w?YLBggWmHAPa@*qs`$3!qbj<S?3`G@()&OfpXB>6-8jQI<mB$$(?{dUFu
z_k1Rp{8yYtzUNswk7D(jz2qN)rC>k&_dkn(C+sVX$M3nIU)}R>XG<O|p7_!789qI0
zwL-oW2^J9b^j)=DSt8i$Bp&^crmN9Qkt85z^hW%Wi6s3oOhr7!3|Do-k`+WNO5^^K
z{r1~J$O&J^ka{9U`hRDjoY6`JglI|s7+&*5FnP^mkdNi<5GIT+8FZ1(<LK9r{W=#R
z<1AM6vMD4WCTuKxPJBgEyc_cgWFElqNO#j<mc_7wDAX#bUyrX=g2#zkBb|$_tE>#o
zYznqXfAp1JTa)-iFKablp>&_8Viv_W%<@k5a@LZT!>pazw~$OK!by^kZ+&dF$Y`WY
z>5o(PLfNe(Nz)>SkQH9@n3YwoU!KYTS8;F+qS%rC66)GGy)ui^{3TndTR;t~Tp>y0
z%tz3$6HAFRJPyJc5mfkh1oJ0rW=xwk*+WW>Y%QrYQCS9hI>R+X7|5*vF(BokFV^NL
z@%ek0Efyp>^<2-Pe@Ke#oTaI(g4Gm;xuaDqu7fCZ^v$C2zlERb@3qdd@gnfqGz)z)
zclPtoFn=Y%V>J*H8X0|IpRCEia{o0WPTY|tP8}x8V=XHzr(TVb3!ku$mVmP}_Ex0I
zbtuGY5m}wFfV4<5(=voY6MVqK2@9hX45wKv;AcjAGEjf*5cm1#>~F`pLX0A@P&rJU
zuy6A3zI-+l>D!d2S@Hse9iK3db+nz*S};Zg8P9VCZRN|3h>S0C_D`HIkH{*&e5Rd?
zNm^w9zRI~ULp0M4KWfnJnoGVB5JV_trIo5?gTu$_Raw{ieYO37c|HF4#H$V$xf1mP
zMaFg_RPk4)w5*ul-)QaIjIy0}HS_U_99d7Q8fIv{Z4n~qDu`e+>T^oDB57a!<n@Oe
zz|D(jv4CH~{n}oaaLuKJ8bK<S_?UYGde#NlC~JZi?GL>6XlrVg<N^4s2}Di-;;N=l
zJX+bwIY32O%5n-kAMKFQX)L5<9bL}Z!MDzn+gotkRU!!eMK)<bgdOjroE8ufAWnuj
z9;W-NrZ}&OqRq_<(Ga}^1{;uqG_C<@yND-p=~rP<vflv+sRidRh&&ga!x3Py${SR?
ztI{*H4D1c|g5_!<2=g~5H)TG2j7-M;w0$-9I<P$DS5pA|g?ZFHltn1kR&lfvaT+wB
zJX7(+3dKsTV3As_z)flCn}TA_*A){ZZduu+H!C9b6&`ez?M=j#XA6jsp6MD0*)8y`
z1Qn;(K@yCEMUdW*t`TZ98l+!Z?!P1=q@P0yS$DBO&$CRM@{NM5UdVZ;wP_=8ffHRt
z(N|!N{?jZb*>cHaNjHV?3Jfd<gK8KnqLD00DOx)-siKl<KS$nDX6nr%2tjY)_51ip
zJxcj(e}k7U4GjRC@118bR{%eOx5FuF?dlz$jsC@BhfQxN6BObK<O4ziK3<4dT0vUW
z$^^7|?U@fPokO^JJ)JP+(LclYAu7Ok_}e8|N=<3O7}BnJ^p^5S=~FF!7}O>kQO+ac
zIEwezyG%Twg{WzMVsN4+4Z^vI0YoO>s|ZaFg%zPq1FZkdap<m@km8U6MdbQLBPfUj
z@>6-`(<4z2j#G?8`N|v3tgGnSArw*ASA!ozQBB`*8#F&mDB2Z|KgJ>{0iDLt2%JZg
z{X=VCW;3J~r$m=gZd0~-DHku~n2TDhrK_7A;HiqjXd!I_T&TZRvXvvDiV8kFp2=4F
z{vweTC?cF`RBR3U&-Ky;fjHn(>8gDddrt`v9RwW=NG5d~3WNwoZ)Ho+rBS6-iwq0k
zS4Z9P%^NWlXyVW|fT}A@9g_eT1$>fYW5w6h0AG!T))Gf9)&>%X!M2r9q=(Q_+vk*~
zvupOCdaA+Xp$qAIfik9d`KPezd&9itdN4s>s!hFKX*SB*4&fV3mUo+d18=KZ_Ycx7
z;E1;O{YUl-bVXFn+NfXb48Q`fi+Z`qwXIXR(8lJW|A*5RRe$h|ge0Q8PSrPNC&zXB
zhnAB_17`c~!8sr0nY<z0zPkOZ`dF^vL;D!*9oY>Qy$k#Rvl{ivN{IZNjO}i%Xs0SX
zJ|QWp=w$kcRNFa2q?q^Z1<{=71*vWM2#sDCOeMTG_-5CDIk>d+H_`%<dlX2X^27y2
zu6_4Cbw3)+)>m@qN57^sHEtcZsUuyeV~s`V&NMbdI(diQ=rrf3PVigns^$wD9Tx|U
z%f`vPg}NNF=?$#C+(9-QaP>jN(xWYmM#WNwL}j@Q&Ob#i+mX*f#M3{Bc-(AO7SBcA
zEZE&_>XOz0WI~AnDN-Fr**k3Mt(p7Smm%zwpTLpO@!>WtbxTPZqwT>BVLx}w__;(Y
z6MjkN4S=~WXkI^;)m+*?zp&w|xwPM$1KCX#I;yfU?<*m>iQjapu@n8*+-!ElTn9!p
z3OrDt%)!u}@a{h2B%-49YO|*b!0;F-<@pU8C_kYzazt7gDa%rCB2>c43!&0zbc=KB
zyi0zOL%YXVx#ghhVVbdsc)J}fJwT_3>ero)##U^_KSt`!$C@=h+jP>1fVtjW#Z8^b
zyO;;f9TF`8!%sLDyVm=`l<OC7s#`#~Kt_gL+k28<A(I2hI0qN0?Nj{38Rwp3?7(pA
zFD*IOB$~J+RgX-&9mMB)I`+LhMK?T3H>V^m)%`CtFf8sh=P`Q?hj)2+1j}2U?Fo`B
z7Vg8gHeq2G1REk?JEq=tNvcbY)y8!o7zuXF4Ys{2?xuuPps7|$a7x=u$I+TY)cJPr
zFUiJDS<=11Z6}Ba=BnuaN0M~*P}Yf4{tYGubDoUH??qEbbxohy!fRcmsYqqK6xW(7
z5{S8hyz80LYCqOoIZ5IYG&Fr>xjq$WhIa<udC#yB+-+iFQ|{DM%=yCwW}p&vpS-!S
lytR+>TwY+`lENIq>S8k$@h^A1|Na=d)txvMLMu=D{|_DPHi`fM

literal 0
HcmV?d00001

diff --git a/docs/phpdoc-cache-89/phpdoc-cache-file_21af159c905d0493a0e92eed8ee6937b.dat b/docs/phpdoc-cache-89/phpdoc-cache-file_21af159c905d0493a0e92eed8ee6937b.dat
index 4c4b2c48359428245aeb65f53e9b8c8e79a27fe2..44c5cc3216e387d265fc57a026138b76754360c2 100644
GIT binary patch
delta 1180
zcmb7DT}&KR6z-kfr7XLpr7frngzGkuEv~@s&a%s(fd-To)`76KnszB2cJDHi?aWSQ
zW<jx)RUfR;Sn#|VjhY&Nnkbsv#>74t8#QS|;<F`DdGRkMEj2#W#?(7AR9pMxyv+U1
z`ObIl`A+V&Yv}S{XmJ?ldy3s89n1Id@pN}8mMTuC3aP?$FP~25W3k@urI|FxCzsyt
zMdH%x_wafBcJOh7aXerWf@RCng|4nSrKEJ0b)uP;L5QVFdS}^~al&0<SyeR2QdD@D
zI}cZPVrcffwk@YhPs+J}aydBbIS$=>?}Brl5M;f%I|<9)Bhcb2`38?FL<3ac3~Id}
zYPa)n*%z;2jTLPMaLqC3+qRQ_TC;{A>aVi_tonofYQ?m$EX@)u;e1&uDl-*>6!5fU
zlBtTJbhhvAtHZZ^$Lnr`@N=!mw06L_Uw0a;`cI>#{|=EQl989$eOh;DWX?sA-2&c-
zSAy+uDG=RkkXd4w1ilG|;J#p+Gd8OMB^dMzcw!@43GS~sS}vC=IwPj<=#_C(c3sDo
zK&^n?08MULLz`VUFm2k}&%twSV^Tva=nX;oOv6VW#&tZjAlmo};^AE58}w|``yMXV
zOQ%AUUiOEnkOt~N8y#)?&5k?xdUO}PxU2oPd^HldiRty|ymMX|Is^B|i(Ik~KFK@|
zC&%BTONpz<#Ugxp_%RykdC7~Cur4RyC*e=HA}8TQ3WJ)<zAAcQu`~iVGJg2s!EfPF
zNrA=I9JC$r!IjBjs2+O?-rQFU6a8cMy;}5N;N^keQJPlwj5rgl3>`vuCx!3?u_}gU
zvURgn;9D(!;*tFhzl!JsdoQ4yGHWB%fBn7}PK;(879jYns~O&!dKQ)kzk&<mLAzjO
z=m2~is)rZHKIG!gob=>)nRCzYz#omR^o#7i4Sb3&9~kza1XTBk&>@Qe2WL^-nf{?e
zmsosVPQh62N7oUmOupcAdz^uH^M_sEPSFnvaSvm-8egL%U6-Fn%*`9rUuv)mXp4Rk
zp%ims0YRka9=c#gJb{Gpv?(NnFng^K%Z$Q83tq?)GDOV0q3BlG2n)PTiN%HRrjAVp
zDH4Ndc@pk31)dke|L29<H7Q3%lT=5+ZEVM5OpECkSYH^(1)Qaxo;{C5s?NR6Arb24
NzvGfT{dImT_cxa1qT&Dm

delta 1031
zcmZ`#T}V@580J0u@$ZOJ(rBihnKZR+Z96-g&NMAG#Q%&Wf0##il(o5;+eAgpi|8hd
zx%VbW!8E#%5aY9ph)4>;BFL+53e#Irq)YpO&d#QU;<-8R_rA~jywCIO{e}H~2wh{W
z)?%B{Y;>B9HZx~4@`At>@q)$7IoaMKlcjsQuZUue(@%=QJN@m4y2d-idtA;Yevt1M
z0>WU`aE~w$aQVC?_!t6MNxj7s*%GcMokE|S#$8z_w#mnpbv~avIDoudjd6-{V6ZU$
zEVe4zWemgM3q{?T6M1ot&O)6s9j);yoQg}tZY8feiYA|xJAlP;bfvz`F9a%uUOwmv
zG)ltqwcWg5a0CZkS{;+e4-9x*J$yv5*zy#VB#H_Szi~$J_yyD?G#opD!wI9un&fxF
zOAyT(a4}hnS+owzDj2*?=P0iWL&BgRx6-ol4NXhqeOfP#tCO=2@|dHU_-Hiw1!OUK
z3rINSGKD`=Gs9^#NlaUo;k)#Qz+rR7>^U=M&pm4VF#g;UznwE<sxRy0D9Lula~Wke
zqAuS{l$m?6dWzi3*@@LY<n*~jmZz1AIHJpc6#0vIAK~;PQg7L$2FhB3UH(>dWL+W-
zwv&p!8whRPl!KM*+Vuc7+_kf~YSZ9cM+<4{G6EIVcRWOO*(->gSvIZUWMv!)m1{tx
z*{q%fTt06gT~}xRpJS+8g&(UzU_nEL5g%0Fkia#Pg&2p3G2!XjaVhYX+Li;l&5IGb
zYQR4YZPAlAajEe&#U2_$2kR!T<~4}+7Rc9@J}Oq@`-}pT)S4{=6RsD};D@#$U`c6v
zGKg9tb|*Tv!75f3GTV7y5%Ux-RNzL>t!PLK<h#=>16JBsl_uhly&fr-Mp|QWL&zl~
zE(4&dGyy}-I;?Xf;nRAKJaeZW@I^8b{TXon&K7WDOm_i)X)cJqt^%$X$w@Hy1;SSp
gI6u4!Ui{?lLG8qvGzpLP19-z@8<a&{980180ooaEkpKVy

diff --git a/docs/phpdoc-cache-97/phpdoc-cache-file_2c03d98fe84f7883648dbd918f694543.dat b/docs/phpdoc-cache-97/phpdoc-cache-file_2c03d98fe84f7883648dbd918f694543.dat
index de9ab9f316b171d26b1ce881216ec607136b2b48..c0e137bfd43f9640ee42dd3e9dad1a62142883b2 100644
GIT binary patch
delta 513
zcmdnBp6T@lrU~u}hDHV!#%9K*h9+sIDF&uSiD||brYT0oNhTIXrp6XV6VpvtObrc<
zC(buz^xJq<f{8I@@>?cN#+1!s%wmjU#U(|VdFcu&g{7%Qm6}!x!KsNw$r+O;3d>Fo
zVEH2slLpeMsU;}#n+sVv8AV|Vk~2%tw9jSx2iKmQUz&$5e}MfT-1g#<#FA80(;soL
zFiOBp2kA$5-vM^k$%0%fC)e<BOg_w&FAY;%kPkF2$2mU*&BSQ#UyL#^MPL^dRVE{=
z+ML9DjmZ(FA}2MiL`MO}E6FcFaEdb1Gmzwx@=Hqcb5WgNB#_O>0T0f*g5r!Zo4*K7
zV-(KJD^XC%$;{0}gy!an!ivt56||OZjtswL#p#!yo0*qbl9@Z%F*b7YhiRuK*|BU+
Wo}9%vS+HMZa*rMN<~LK$F#!PSX|xmo

delta 338
zcmaF8foa!zrU~u}i7APurpBfQCP}8omL}!~2BxVgX~xOsW`-6i7HJmd6VpvtOe~E}
zC(buz%-eWXf@$(QCe6(f%wmk}Dutz~MU|S9AF|6%PGtGRp;BB@l$u%s7T7$Im6MT8
zB{{PMtUzw^S+>6%D#`h!c|d{9580)G+KWpPOHv`K^*LD>IU&*z6O|_Ca;;>~%qvMv
zPc51(!(GUuQjibSkmH=60@ZVr`xhfGOiwaMc=K)EYfQ2#IjLzSItnT!`2|3-C^J0+
z#7oLADap@;*v2oI%_z>L00h-w62wwTEJ`m{uvOSROK2L<Z8@2_nNXi3h_E<M{?opE
kGgrhdE6%+9+|0bhlFZ!6AA_PddrUTCV$9oIKlKe00A_A-;{X5v

diff --git a/docs/phpdoc-cache-d1/phpdoc-cache-file_c24bbd97c22a0e2877aadb465d8290c8.dat b/docs/phpdoc-cache-d1/phpdoc-cache-file_c24bbd97c22a0e2877aadb465d8290c8.dat
index ecfac5f1907513a7fb50700b1a096c4e7db6ed1a..290d2404518164effe53245e5781ce809fcf3b57 100644
GIT binary patch
delta 224
zcmaDiopId^#t9zsY37DziHYXMCPrqa7HO$Q#zx5&X2yw07O80|CaFmi)6JNTj4dWE
zFk|%Fc>NZ$R&hyDW?s62N=aows-~4fP-<CfQE@7l0uWS#Nf0YDO+h1O^C^}-M#0Ry
z5(Sma6ok^r6WC=pSF-UiDx~G)CjupN5=(U8?EE~0%FPqlO&Nv322|ze=OQG)M!evt
gwdM57&&|wBEXmBB9H<<*`M8@U6Qkc|M$flQ063&bx&QzG

delta 160
zcmZ2CgYn&T#t9zsmWj!RCWgkTre-N-$p&dDN#@B0mdS}029}md$)+h2)6JL-%}pjQ
zFk{Tyc>NZ$q)JI;L8>N~0uWS#Nf0YDO+jPxZI(Vp7M08t&B@%HvYV%~@i20$<Rq5p
zD5&J*=RpJ?uuCwqsZ{0X=W1@|=A32AnU|lNnU`3SnLBx+a^z-qcS|P5yv>fDZ<zol
CrZ6-B

diff --git a/docs/phpdoc-cache-d3/phpdoc-cache-file_8ddf77c5157272b7bd4b14070db0fde7.dat b/docs/phpdoc-cache-d3/phpdoc-cache-file_8ddf77c5157272b7bd4b14070db0fde7.dat
deleted file mode 100644
index eeb284212729dd7d2b57ec98ddf8bbccdfa4ccd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16204
zcmeHOS##S)63#P!#Vkvel2l2=Q?j7VRd#ka4{=<!cVCuUsUbKNu?7JIhZ4onf6v!*
zVE_^&WrC$Rl3pYMb98@w_Y8jYhL>J9StKuFzgUVWkJHHuk@;zm(4YSZLQ($P^#%j)
zedb+w-A_(GS@3Mpy~@1d!0TT0Mk8@C=d<x_Hooln{d3WuKJ(89gL8f{<s%xWW+gmV
zvxZ*xyI*~g<Ut%|lb7)_h<F|>?XxdH6iowp*er{S)ED%B|8m^(x_|!~uRCX_ryX|6
z-Y$ZS%|R;j<0$7rl;Mw=V0;=EIa~5y7v=gByTQ6mnIG~j!<uKEPQ;fYOSmtZSGekQ
zicGLqSvvVwo+pzZM3(VuF?lV1E<~1pALSyQV}+}xVOav^MQz+ai{E|=g<SAe3S2TV
z(Z8L6az)Dv2+>%4AKmaUn7!gD$jA0}2onZv2DI`;8vhcpUlt-_oTZ9hHs=6w#-_sO
z#8*7WyD6Uml>n+i=+1-dB88md2p|#m&HM2r5j@S*9{ECS-6b(JvpLwN#c7t_Ta);O
z-u4>^<{hA}$%ZC<<MUix$LTGzyeo-H*|Jql12VaYW?4DD^S;wz_>q{>AE)fO(kw}m
zrbP~+4R3hL>LS-K&*bkU4Q@abJJK^Du8qqpwWzIM)0L(T)UdTXWO-WnFl)Q8M4aJq
z5M2{Nm7gQ1KWQ^#TCGVRaxyimNwtOQ80h5;*9?YQY5}Y?=aDZ~)~NCMdsKuWA*Y_}
zHS|A{BD-d7DJy=pgkkO|NySYN7mmDHJpI4$b3I?nteA#@&*nwsle)8?euDZd1dr7~
zENC$L%syGcz;N#lsj=vA_a!5C%dwURR+6p8$Q@7Ed%N@58G9pgWi#acG&WXPEFkd_
zSQ<P?GQ$KO%~%xY;508%0RuB)lRorIhqzBaWq&&^C1E6pjq3jCgneDk`~0hGk-y1#
zUS!Wf*zpPTSWhb`?FB7_ckw(IVGArfA~HTJ**|e+9+5hJ{*|^WCTW$P_p0Q=4AD$G
z{HQ^9E4KJr0EkFprKPD>gQchH)x>qtS$bg{z8<$;fdGPD?)XFwEJdf6t+KNdd5WtY
z=+o@~ccz0oRQiA0$yKwq(yN9Ug6}#iPRqb;qv*F`z%!9`uYUA~;|(dt^EeD)i=eOT
z^(otUCf5mavBYHVjp$kb-0RjYjW!*QyzXRcIF{rg9eJ%S!G=}21c+O=gyOL>l&Gj{
zzFY#&D=N|u#c3?k8*Af|E+jW)j?%rly92j<1wrJ81?0Ckggx)QTo#ENQY-1!c$Bxj
zuJN4htqW*~UP{qgKtU?kh@^d=43WSefsn?O`8kp2=FI&|(pZ(oDp$8o&X6)PVz3u1
zlTc75-X3mBefSj7i~D)^YU=f%dCIQlNV`MxsDCJpP^=|soQO0JS`eP8L$vFcQo$yT
zQh}M$*0&YGoUaNdMSWqh$!`-P^(7wkmF~^NoEIS=q-VM^L0}7fi=g84Cdh(m5C-`z
z$r`RkXMpsd#{K6^MD*{NT-JRw(DN+Qrl=w(t2c7qX=z#yT;W9L&om3H(J#$nRxFo1
zm2^XMyKC}ZIT%z!S)FL&uB1vms>mF?C1&bP7(}2q@P?#^>QT<G_g8pn(vScW^1YoT
z)(T)Juyz<lqh7t`*OUM7)M3*b%K!zx0(?M7z^9>jsRg8=Rw|&?YtMLS=^Vq%o9Toq
zPyQXfi%|8w#osQ$5;Y|Sqe#2P(L0JGwW%6@DAXn$QN|<EG*0)Iy9{Wcg{WzNVQ``r
z4Wflek%-K`Qy!WO3OhoYCa3<G{m^|QA^9Pd6p`sym7oF%@KbT+!#&XehEw%K<<1+`
ztgq<W!4;ibCZ1eTLpN|+YJM13v}->8<clN%I*g<Fw}@x^yVjwMW(X}#buPW!rfBnn
z+`JNFE*f(!UES=Eo+>Ylw$ZkP3-wnb+cz>*QO<{_*RsLAKP0jOg@-deimgunTfKD!
z5GVOmvg%%?-sKQp=pfm_h%jkt^HWAJc_Z6^E{!Uz+RU(${A#Z|y?rg_0{t6m&a1k@
z)G-<IqJYoJ+*t87H;J##g;oMb32O_1!{oMWQ;`8&OJi?Ss?M&_qvbqS7w8X?%9wuT
zN1@dZmh-Nw2M=fxZB})gO#*M%b?G0aHNgICxBJg*4rqp`Qngic*g5YCygth0Hur|N
zrehH5ep34rIw^Y%y7!Wy2dv-YrSj};$Dyj|4<3jRXOz{cvc{a<xMu&@LJ>*8oYXx!
z<0F-?oC5q+ZLE~=p>2!~YwSsjKJa~nQH>mGEfGH_WxHPo+9?K)PYA_o7EdLeGep9?
zZwrXlL<>lrz{lwCTHik_k2L8ixREb+b(o{ErN5QVk35<{@RXM;$aC#`+^O5p2z1Q_
z9NN&Y==zLXzHMqmSISqT5xOCbGmswDp;eid95n&IwVZ0dp1D(ganw3CPUNkW<G^Mx
z`VefOl}&l|L0}os$wjNM)Kj85E~B!8YK{?h&>1M%mdxiM@C*+Ej~mVE@LZHVg5BY1
z3R(xigaQLXq`Hc-x7*SuG7oVaL%CCV*G8s}kGEH;J4s3zZR>3e{kdnvFA-fE@N1a2
zkj(W#^Xg5k_QL*o>Bid&`|TN!Jxie*DjVaz0?7^hra_IO`A>YtJV11++>&xG(&@^-
znt?drHl-js_dAe#EW_EJN!>$wNBBZ%%jN(TX~L6xlno~99zUQUav)vnAM2>M;UJ;q
z6$fb~y2UtlJ`%qui-0E&x#d=>b=PgSL8+ix;~|Zl*Bp57;3DaGu5t^QLh6&l#Kp^X
zw|iv&S>5Tw7csN9DG%Dam|4rpKHx5Dy-25|Y4rmanKZ5RUovk1b!kom<tzkLWD(9~
zLF%_xdqvJT_wHa1%G>;Lkn>eS8y_P{8bFymCQx6m(FJm7cE1PRZl+`3kCgJ&FO=l2
z>zhyL9@yT2xdS<9*~`ic8`$2;Y|mW9dbS~SYf~cXW}t=$$io!7E=f%hYQ1tD$T@)>
z^QG9{<!)ObRcLBN2}Wr<*|^SfF!xQBbXH8;(xeB=dL1Vom`^hIzXqgBYo(pIS>Iw{
z&?la_hy6~pbv@QJd2N=fYo%(9g%5n!1Q7Er?ymPZvE~bNQ=VL~bj(h0c!no!f3({i
f0yLvL=e=d4uD!I^^?o0bL#_()K#usY;%5E;%&Tu>

diff --git a/docs/phpdoc-cache-d7/phpdoc-cache-file_821e8e95065b6bbe12e3c72dcdfa6673.dat b/docs/phpdoc-cache-d7/phpdoc-cache-file_821e8e95065b6bbe12e3c72dcdfa6673.dat
index 43aabd2386b0e03c9a2958d0a94ffcc16ec5809c..c336e3dfc83642e1ce6519ce287adde557eb0e42 100644
GIT binary patch
delta 162
zcmewyJ0Wg@yL^&SYHEt9S&E5eYNDZqk$IxIk%76PrMab%VWN>y(!?}#CJT#+^GzB3
zHeStToV<;Nf3p|UT}I*JlA_GKbOn{n6iq7ypZxsn(t^#}EFp~SP>Id;tn)b;%_dKf
z_1m1wug}hC1Y%Ck<zKpag7`IdM)OJP!JBu<Z{lPG%4^PK;`GbU&CE+I$;_SnP*iNQ
Is?Iqk0L?fyDF6Tf

delta 136
zcmbOb_c?ZgyS!1dsc}+@p*e_7Gfy!vNHI(@O0_gJN=ZvhO|_VqX3k`4IdQ%zW8TKA
zxs01VnVvGTsAQ&SZgyk|Vca~2bv`Gf>EyMtew(}a_1PH>LCncr{7W~l6~D&LXf|0^
mJ$UnV`AwXRd7Ha5XEJf-<>zMRC6;97PW~q<w%JMN91{Q@PcGsB

diff --git a/docs/reports/deprecated.html b/docs/reports/deprecated.html
index 76bdabc..12db988 100644
--- a/docs/reports/deprecated.html
+++ b/docs/reports/deprecated.html
@@ -151,7 +151,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/reports/errors.html b/docs/reports/errors.html
index 302f5fc..d8c7ead 100644
--- a/docs/reports/errors.html
+++ b/docs/reports/errors.html
@@ -164,7 +164,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/docs/reports/markers.html b/docs/reports/markers.html
index 8ee300e..1911842 100644
--- a/docs/reports/markers.html
+++ b/docs/reports/markers.html
@@ -150,7 +150,7 @@ <h1><i class="icon-pushpin"></i></h1>
                 <section class="span10 offset1">
                     <hr />
                     Documentation is powered by <a href="http://www.phpdoc.org/">phpDocumentor </a> and authored
-                    on January 14th, 2018 at 23:46.
+                    on March 26th, 2018 at 20:58.
                 </section>
             </section>
         </section>
diff --git a/examples/LookupExample.php b/examples/LookupExample.php
index c373df3..6f8374e 100644
--- a/examples/LookupExample.php
+++ b/examples/LookupExample.php
@@ -1,22 +1,35 @@
 <?php
 
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 
 use maxh\Nominatim\Nominatim;
 
 //URL Server
-$url = "http://nominatim.openstreetmap.org/";
+$url = 'http://nominatim.openstreetmap.org/';
 
-$instance = new Nominatim($url);
+try {
+    $instance = new Nominatim($url);
 
-$Lookup = $instance->newLookup()
-			->format('xml')
-			->osmIds('R146656,W104393803,N240109189')
-			->nameDetails(true);
+    $lookup = $instance->newLookup()
+        ->osmIds('R146656,W104393803,N240109189')
+        ->nameDetails(true)
+        ->format('xml');
 
-$result = $instance->find($Lookup);
+    $result = $instance->find($lookup);
 
-echo 'URL : ' . $url . $Lookup->getPath() . '?'. $Lookup->getQueryString();
+    echo 'URL : ' . $url . $lookup->getPath() . '?'. $lookup->getQueryString();
 
+    var_dump($result);
 
-var_dump($result);
\ No newline at end of file
+} catch (\maxh\Nominatim\Exceptions\InvalidParameterException $e) {
+    // If you set invalid parameter in instance
+    var_dump($e->getMessage());
+} catch (\GuzzleHttp\Exception\ClientException $e) {
+    // If you have any exceptions with Guzzle
+    var_dump($e->getMessage());
+} catch (\maxh\Nominatim\Exceptions\NominatimException $e) {
+    // If you set a wrong instance of Nominatim
+    var_dump($e->getMessage());
+}
diff --git a/examples/ReverseExample.php b/examples/ReverseExample.php
index 68b9c56..6853130 100644
--- a/examples/ReverseExample.php
+++ b/examples/ReverseExample.php
@@ -1,19 +1,31 @@
 <?php
 
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 
 use maxh\Nominatim\Nominatim;
 
 //URL Server
-$url = "http://nominatim.openstreetmap.org/";
+$url = 'http://nominatim.openstreetmap.org/';
+
+try {
+
+    $instance = new Nominatim($url);
 
-$instance = new Nominatim($url);
+    $reverse = $instance->newReverse()
+        ->latlon(43.4843941, -1.4960842);
 
-$Reverse = $instance->newReverse()
-			->latlon(43.4843941, -1.4960842);
+    $result = $instance->find($reverse);
 
-$result = $instance->find($Reverse);
+    echo 'URL : ' . $url . $reverse->getPath() . '?' . $reverse->getQueryString();
 
-echo 'URL : ' . $url . $Reverse->getQueryString();
+    var_dump($result);
 
-var_dump($result);
\ No newline at end of file
+} catch (\GuzzleHttp\Exception\ClientException $e) {
+    // If you have any exceptions with Guzzle
+    var_dump($e->getMessage());
+} catch (\maxh\Nominatim\Exceptions\NominatimException $e) {
+    // If you set a wrong instance of Nominatim
+    var_dump($e->getMessage());
+}
diff --git a/examples/SearchExample.php b/examples/SearchExample.php
index dc58ad8..ba812b4 100644
--- a/examples/SearchExample.php
+++ b/examples/SearchExample.php
@@ -1,24 +1,38 @@
 <?php
 
+declare(strict_types=1);
+
 require '../vendor/autoload.php';
 
 use maxh\Nominatim\Nominatim;
 
 //URL Server
-$url = "http://nominatim.openstreetmap.org/";
+$url = 'http://nominatim.openstreetmap.org/';
+
+try {
 
-$instance = new Nominatim($url);
+    $instance = new Nominatim($url);
 
-$Search = $instance->newSearch()
-			->country('France')
-			->city('Bayonne')
-			->postalCode('64100')
-			->polygon('geojson')
-			->addressDetails();
+    $search = $instance->newSearch()
+        ->country('France')
+        ->city('Bayonne')
+        ->postalCode('64100')
+        ->polygon('geojson')
+        ->addressDetails();
 
-$result = $instance->find($Search);
+    $result = $instance->find($search);
 
-echo 'URL : ' . $url . $Search->getPath() . '?'. $Search->getQueryString();
+    echo 'URL : ' . $url . $search->getPath() . '?' . $search->getQueryString();
 
+    var_dump($result);
 
-var_dump($result);
\ No newline at end of file
+} catch (\maxh\Nominatim\Exceptions\InvalidParameterException $e) {
+    // If you set invalid parameter in instance
+    var_dump($e->getMessage());
+} catch (\GuzzleHttp\Exception\ClientException $e) {
+    // If you have any exceptions with Guzzle
+    var_dump($e->getMessage());
+} catch (\maxh\Nominatim\Exceptions\NominatimException $e) {
+    // If you set a wrong instance of Nominatim
+    var_dump($e->getMessage());
+}
diff --git a/src/Exceptions/InvalidParameterException.php b/src/Exceptions/InvalidParameterException.php
index 83a02ff..e2398fa 100644
--- a/src/Exceptions/InvalidParameterException.php
+++ b/src/Exceptions/InvalidParameterException.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * This file contains code about maxh\Nominatim\Exceptions\InvalidParameterException class
+ *
+ * @package      maxh\Nominatim
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
 namespace maxh\Nominatim\Exceptions;
diff --git a/src/Exceptions/NominatimException.php b/src/Exceptions/NominatimException.php
index c7d63a7..52e991a 100644
--- a/src/Exceptions/NominatimException.php
+++ b/src/Exceptions/NominatimException.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * This file contains code about maxh\Nominatim\Exceptions\NominatimException class
+ *
+ * @package      maxh\Nominatim
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
 namespace maxh\Nominatim\Exceptions;
@@ -44,7 +47,7 @@ class NominatimException extends Exception
      */
     public function __construct(
         $message,
-        RequestInterface $request,
+        RequestInterface $request = null,
         ResponseInterface $response = null,
         Exception $previous = null
     ) {
@@ -59,16 +62,16 @@ public function __construct(
 
     /**
      * Return the Request
-     * @return \GuzzleHttp\Psr7\Request
+     * @return RequestInterface
      */
-    public function getRequest()
+    public function getRequest(): RequestInterface
     {
         return $this->request;
     }
 
     /**
      * Return the Response
-     * @return \GuzzleHttp\Psr7\Response [description]
+     * @return PromiseInterface|ResponseInterface
      */
     public function getResponse()
     {
diff --git a/src/Lookup.php b/src/Lookup.php
index 623fa47..34885af 100644
--- a/src/Lookup.php
+++ b/src/Lookup.php
@@ -2,7 +2,7 @@
 /**
  * Class Lookup
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -20,6 +20,7 @@ class Lookup extends Query
 
     /**
      * Constuctor
+     *
      * @param array $query Default value for this query
      */
     public function __construct(array $query = [])
@@ -38,7 +39,7 @@ public function __construct(array $query = [])
      *
      * @return \maxh\Nominatim\Lookup
      */
-    public function osmIds($id)
+    public function osmIds(string $id): Lookup
     {
         $this->query['osm_ids'] = $id;
 
@@ -53,7 +54,7 @@ public function osmIds($id)
      * @return void
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  Polygon is not supported with lookup
      */
-    public function polygon($polygon)
+    public function polygon(string $polygon)
     {
         throw new InvalidParameterException('The polygon is not supported with lookup');
     }
diff --git a/src/Nominatim.php b/src/Nominatim.php
index 16f335a..8f90e51 100644
--- a/src/Nominatim.php
+++ b/src/Nominatim.php
@@ -2,7 +2,7 @@
 /**
  * Class Nominatim
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -12,12 +12,12 @@
 use GuzzleHttp\Psr7\Request;
 use Psr\Http\Message\ResponseInterface;
 
-use maxh\Nominatim\Exceptions\InvalidParameterException;
 use maxh\Nominatim\Exceptions\NominatimException;
 
 /**
  *  Wrapper to manage exchanges with OSM Nominatim API
  *
+ * @see http://wiki.openstreetmap.org/wiki/Nominatim
  */
 class Nominatim
 {
@@ -30,7 +30,7 @@ class Nominatim
 
     /**
      * Contain http client connection
-     * @var Client
+     * @var \GuzzleHttp\Client
      */
     private $http_client;
 
@@ -38,37 +38,37 @@ class Nominatim
      * The search object which serves as a template for new ones created
      * by 'newSearch()' method.
      *
-     * @var Search
+     * @var \maxh\Nominatim\Search
      */
     private $baseSearch;
 
     /**
      * Template for new ones created by 'newReverser()' method.
-     * @var Reverse
+     * @var \maxh\Nominatim\Reverse
      */
     private $baseReverse;
 
     /**
      * Template for new ones created by 'newLookup()' method.
-     * @var Lookup
+     * @var \maxh\Nominatim\Lookup
      */
     private $baseLookup;
 
     /**
      * Constructor
      *
-     * @param string              $application_url Contain url of the current application
-     * @param \GuzzleHttp\Client|null $http_client     Client object from Guzzle
+     * @param string $application_url Contain url of the current application
+     * @param \GuzzleHttp\Client|null $http_client Client object from Guzzle
      *
-     * @throws \maxh\Nominatim\Exceptions\InvalidParameterException
+     * @throws \maxh\Nominatim\Exceptions\NominatimException
      */
     public function __construct(
-        $application_url,
+        string $application_url,
         Client $http_client = null
     ) {
 
         if (empty($application_url)) {
-            throw new InvalidParameterException('Application url parameter is empty');
+            throw new NominatimException('Application url parameter is empty');
         }
 
         if ($http_client === null) {
@@ -81,12 +81,14 @@ public function __construct(
             $application_url_client = $http_client->getConfig('base_uri');
 
             if (empty($application_url_client)) {
-                $http_client->setDefaultOption('base_uri', $application_url);
-            } elseif ($application_url_client !== $application_url) {
-                throw new InvalidParameterException("http_client parameter hasn't the same url application.");
+                throw new NominatimException('http_client must have a configured base_uri.');
+            }
+
+            if ($application_url_client !== $application_url) {
+                throw new NominatimException("http_client parameter hasn't the same url application.");
             }
         } else {
-            throw new InvalidParameterException('http_client parameter must be a \\GuzzleHttp\\Client object or empty');
+            throw new NominatimException('http_client parameter must be a \\GuzzleHttp\\Client object or empty');
         }
 
         $this->application_url = $application_url;
@@ -101,29 +103,29 @@ public function __construct(
     /**
      * Returns a new search object based on the base search.
      *
-     * @return Search
+     * @return \maxh\Nominatim\Search
      */
-    public function newSearch()
+    public function newSearch(): Search
     {
         return clone $this->baseSearch;
     }
 
     /**
-     * Returns a new search object based on the base reverse.
+     * Returns a new reverse object based on the base reverse.
      *
-     * @return Reverse
+     * @return \maxh\Nominatim\Reverse
      */
-    public function newReverse()
+    public function newReverse(): Reverse
     {
         return clone $this->baseReverse;
     }
 
     /**
-     * Returns a new search object based on the base lookup.
+     * Returns a new lookup object based on the base lookup.
      *
-     * @return Lookup
+     * @return \maxh\Nominatim\Lookup
      */
-    public function newLookup()
+    public function newLookup(): Lookup
     {
         return clone $this->baseLookup;
     }
@@ -138,7 +140,7 @@ public function newLookup()
      * @return array|\SimpleXMLElement
      * @throws \maxh\Nominatim\Exceptions\NominatimException if no format for decode
      */
-    private function decodeResponse($format, Request $request, ResponseInterface $response)
+    private function decodeResponse(string $format, Request $request, ResponseInterface $response)
     {
         if ($format === 'json') {
             return json_decode($response->getBody(), true);
@@ -156,7 +158,7 @@ private function decodeResponse($format, Request $request, ResponseInterface $re
      *
      * @param  QueryInterface $nRequest The object request to send
      *
-     * @return array                                         The decoded data returned from Nominatim
+     * @return array|\SimpleXMLElement                                         The decoded data returned from Nominatim
      * @throws \GuzzleHttp\Exception\ClientException         if http request is an error
      * @throws \maxh\Nominatim\Exceptions\NominatimException if no format for decode
      */
@@ -182,7 +184,7 @@ public function find(QueryInterface $nRequest)
      * Return the client using by instance
      * @return \GuzzleHttp\Client
      */
-    public function getClient()
+    public function getClient(): Client
     {
         return $this->http_client;
     }
diff --git a/src/Query.php b/src/Query.php
index fff585f..8a90dc0 100644
--- a/src/Query.php
+++ b/src/Query.php
@@ -2,7 +2,7 @@
 /**
  * Class Query
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -13,7 +13,7 @@
 /**
  * Class implementing functionality common to requests nominatim.
  */
-class Query implements QueryInterface
+abstract class Query implements QueryInterface
 {
     /**
      * Contain the path of the request
@@ -37,7 +37,7 @@ class Query implements QueryInterface
      * Output format accepted
      * @var array
      */
-    protected $accepteFormat = ['xml', 'json'];
+    protected $acceptedFormat = ['xml', 'json'];
 
     /**
      * Output polygon format accepted
@@ -68,14 +68,14 @@ public function __construct(array $query = [])
      *
      * @param  string $format The output format for the request
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException if format is not supported
      */
-    public function format($format)
+    public function format(string $format): Query
     {
         $format = strtolower($format);
 
-        if (in_array($format, $this->accepteFormat, true)) {
+        if (\in_array($format, $this->acceptedFormat, true)) {
             $this->setFormat($format);
 
             return $this;
@@ -94,9 +94,9 @@ public function format($format)
      *                                  specified in the "Accept-Language" HTTP header. Either uses standard rfc2616
      *                                  accept-language string or a simple comma separated list of language codes.
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function language($language)
+    public function language(string $language): Query
     {
         $this->query['accept-language'] = $language;
 
@@ -108,9 +108,9 @@ public function language($language)
      *
      * @param  boolean $details
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function addressDetails($details = true)
+    public function addressDetails(bool $details = true): Query
     {
         $this->query['addressdetails'] = $details ? '1' : '0';
 
@@ -124,9 +124,9 @@ public function addressDetails($details = true)
      *
      * @param  string $email Address mail
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function email($email)
+    public function email(string $email): Query
     {
         $this->query['email'] = $email;
 
@@ -138,12 +138,12 @@ public function email($email)
      *
      * @param  string $polygon
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Query
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  if polygon format is not supported
      */
-    public function polygon($polygon)
+    public function polygon(string $polygon)
     {
-        if (in_array($polygon, $this->polygon, true)) {
+        if (\in_array($polygon, $this->polygon, true)) {
             $this->query['polygon_' . $polygon] = '1';
 
             return $this;
@@ -157,9 +157,9 @@ public function polygon($polygon)
      *
      * @param  boolean $tags
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function extraTags($tags = true)
+    public function extraTags(bool $tags = true): Query
     {
         $this->query['extratags'] = $tags ? '1' : '0';
 
@@ -172,9 +172,9 @@ public function extraTags($tags = true)
      *
      * @param  boolean $details
      *
-     * @return \maxh\Nominatim\Query
+     * @return \maxh\Nominatim\Search|\maxh\Nominatim\Reverse|\maxh\Nominatim\Lookup
      */
-    public function nameDetails($details = true)
+    public function nameDetails(bool $details = true): Query
     {
         $this->query['namedetails'] = $details ? '1' : '0';
 
@@ -186,7 +186,7 @@ public function nameDetails($details = true)
      *
      * @return string
      */
-    public function getQueryString()
+    public function getQueryString(): string
     {
         return http_build_query($this->query);
     }
@@ -197,7 +197,7 @@ public function getQueryString()
      * Get path
      * @return string
      */
-    public function getPath()
+    public function getPath(): string
     {
         return $this->path;
     }
@@ -206,7 +206,7 @@ public function getPath()
      * Get query
      * @return array
      */
-    public function getQuery()
+    public function getQuery(): array
     {
         return $this->query;
     }
@@ -215,7 +215,7 @@ public function getQuery()
      * Get format
      * @return string
      */
-    public function getFormat()
+    public function getFormat(): string
     {
         return $this->format;
     }
@@ -224,7 +224,7 @@ public function getFormat()
      * Set path
      * @param string $path Name's path of the service
      */
-    protected function setPath($path)
+    protected function setPath(string $path)
     {
         $this->path = $path;
     }
@@ -233,7 +233,7 @@ protected function setPath($path)
      * Set query
      * @param array $query Parameter of the query
      */
-    protected function setQuery(array $query = [ ])
+    protected function setQuery(array $query = [])
     {
         $this->query = $query;
     }
@@ -242,7 +242,7 @@ protected function setQuery(array $query = [ ])
      * Set format
      * @param string $format Format returning by the response
      */
-    protected function setFormat($format)
+    protected function setFormat(string $format)
     {
         $this->format = $this->query['format'] = $format;
     }
diff --git a/src/QueryInterface.php b/src/QueryInterface.php
index e52932c..d7676d0 100644
--- a/src/QueryInterface.php
+++ b/src/QueryInterface.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Interface QueryInterce
+ * Interface QueryInterface
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -13,7 +13,7 @@
  */
 interface QueryInterface
 {
-    
+
     /**
      * Get path of the request
      *
@@ -23,14 +23,14 @@ interface QueryInterface
      *
      * @return string
      */
-    public function getPath();
+    public function getPath(): string;
 
     /**
      * Get the query to send
      *
      * @return array
      */
-    public function getQuery();
+    public function getQuery(): array;
 
     /**
      * Get the format of the request
@@ -39,5 +39,5 @@ public function getQuery();
      *
      * @return string
      */
-    public function getFormat();
+    public function getFormat(): string;
 }
diff --git a/src/Reverse.php b/src/Reverse.php
index 405152b..3b7bc53 100644
--- a/src/Reverse.php
+++ b/src/Reverse.php
@@ -2,7 +2,7 @@
 /**
  * Class Reverse
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -46,9 +46,9 @@ public function __construct(array $query = [])
      * @return \maxh\Nominatim\Reverse
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  if osm type is not supported
      */
-    public function osmType($type)
+    public function osmType(string $type): Reverse
     {
-        if (in_array($type, $this->osmType, true)) {
+        if (\in_array($type, $this->osmType, true)) {
             $this->query['osm_type'] = $type;
 
             return $this;
@@ -64,7 +64,7 @@ public function osmType($type)
      *
      * @return \maxh\Nominatim\Reverse
      */
-    public function osmId($id)
+    public function osmId(int $id): Reverse
     {
         $this->query['osm_id'] = $id;
 
@@ -79,7 +79,7 @@ public function osmId($id)
      *
      * @return \maxh\Nominatim\Reverse
      */
-    public function latlon($lat, $lon)
+    public function latlon(float $lat, float $lon): Reverse
     {
         $this->query['lat'] = $lat;
 
@@ -95,7 +95,7 @@ public function latlon($lat, $lon)
      *
      * @return \maxh\Nominatim\Reverse
      */
-    public function zoom($zoom)
+    public function zoom(int $zoom): Reverse
     {
         $this->query['zoom'] = (string) $zoom;
 
diff --git a/src/Search.php b/src/Search.php
index bfe711c..7a5be81 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -2,7 +2,7 @@
 /**
  * Class Search
  *
- * @package      maxh\nominatim
+ * @package      maxh\Nominatim
  * @author       Maxime Hélias <maximehelias16@gmail.com>
  */
 
@@ -28,8 +28,8 @@ public function __construct(array $query = [])
 
         $this->setPath('search');
 
-        $this->accepteFormat[] = 'html';
-        $this->accepteFormat[] = 'jsonv2';
+        $this->acceptedFormat[] = 'html';
+        $this->acceptedFormat[] = 'jsonv2';
     }
 
     // -- Builder methods ------------------------------------------------------
@@ -41,7 +41,7 @@ public function __construct(array $query = [])
      *
      * @return \maxh\Nominatim\Search
      */
-    public function query($query)
+    public function query(string $query): Search
     {
         $this->query['q'] = $query;
 
@@ -57,7 +57,7 @@ public function query($query)
      *
      * @return \maxh\Nominatim\Search
      */
-    public function street($street)
+    public function street(string $street): Search
     {
         $this->query['street'] = $street;
 
@@ -73,7 +73,7 @@ public function street($street)
      *
      * @return \maxh\Nominatim\Search
      */
-    public function city($city)
+    public function city(string $city): Search
     {
         $this->query['city'] = $city;
 
@@ -89,7 +89,7 @@ public function city($city)
      *
      * @return \maxh\Nominatim\Search
      */
-    public function county($county)
+    public function county(string $county): Search
     {
         $this->query['county'] = $county;
 
@@ -105,7 +105,7 @@ public function county($county)
      *
      * @return \maxh\Nominatim\Search
      */
-    public function state($state)
+    public function state(string $state): Search
     {
         $this->query['state'] = $state;
 
@@ -121,7 +121,7 @@ public function state($state)
      *
      * @return \maxh\Nominatim\Search
      */
-    public function country($country)
+    public function country(string $country): Search
     {
         $this->query['country'] = $country;
 
@@ -133,11 +133,11 @@ public function country($country)
      *
      * Do not combine with query().
      *
-     * @param  integer $postalCode The postal code
+     * @param  string $postalCode The postal code
      *
      * @return \maxh\Nominatim\Search
      */
-    public function postalCode($postalCode)
+    public function postalCode(string $postalCode): Search
     {
         $this->query['postalcode'] = $postalCode;
 
@@ -155,7 +155,7 @@ public function postalCode($postalCode)
      * @return \maxh\Nominatim\Search
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException if country code is invalid
      */
-    public function countryCode($countrycode)
+    public function countryCode(string $countrycode): Search
     {
         if (!preg_match('/^[a-z]{2}$/i', $countrycode)) {
             throw new InvalidParameterException("Invalid country code: \"$countrycode\"");
@@ -180,7 +180,7 @@ public function countryCode($countrycode)
      *
      * @return \maxh\Nominatim\Search
      */
-    public function viewBox($left, $top, $right, $bottom)
+    public function viewBox(string $left, string $top, string $right, string $bottom): Search
     {
         $this->query['viewbox'] = $left . ',' . $top . ',' . $right . ',' . $bottom;
 
@@ -193,9 +193,9 @@ public function viewBox($left, $top, $right, $bottom)
      * @return \maxh\Nominatim\Search
      * @throws \maxh\Nominatim\Exceptions\InvalidParameterException  if no place id
      */
-    public function exludePlaceIds()
+    public function exludePlaceIds(): Search
     {
-        $args = func_get_args();
+        $args = \func_get_args();
 
         if (count($args) > 0) {
             $this->query['exclude_place_ids'] = implode(', ', $args);
@@ -213,7 +213,7 @@ public function exludePlaceIds()
      *
      * @return \maxh\Nominatim\Search
      */
-    public function limit($limit)
+    public function limit(int $limit): Search
     {
         $this->query['limit'] = (string) $limit;
 
diff --git a/tests/LookupTest.php b/tests/LookupTest.php
index cd3b9cb..6bd227a 100644
--- a/tests/LookupTest.php
+++ b/tests/LookupTest.php
@@ -1,23 +1,38 @@
 <?php
+/**
+ * Class LookupTest
+ *
+ * @package      maxh\Nominatim\Test
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
+ */
 
 namespace maxh\Nominatim\Test;
 
-use maxh\Nominatim\Nominatim;
-
 class LookupTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $url = 'http://nominatim.openstreetmap.org/';
 
+    /**
+     * Contain url of the current application
+     * @var \maxh\Nominatim\Nominatim
+     */
     private $nominatim;
 
+    /**
+     * @throws \maxh\Nominatim\Exceptions\NominatimException
+     */
     protected function setUp()
     {
-        $this->nominatim = new Nominatim($this->url);
+        $this->nominatim = new \maxh\Nominatim\Nominatim($this->url);
     }
 
+    /**
+     * @throws \maxh\Nominatim\Exceptions\InvalidParameterException
+     */
     public function testOsmIds()
     {
+        /** @var \maxh\Nominatim\Lookup $lookup */
         $lookup = $this->nominatim->newLookup()
             ->format('xml')
             ->osmIds('R146656,W104393803,N240109189');
diff --git a/tests/NominatimTest.php b/tests/NominatimTest.php
index 8a611be..6b4e0fd 100644
--- a/tests/NominatimTest.php
+++ b/tests/NominatimTest.php
@@ -10,11 +10,13 @@
 class NominatimTest extends \PHPUnit_Framework_TestCase
 {
 
-    protected $url = "http://nominatim.openstreetmap.org/";
+    protected $url = 'http://nominatim.openstreetmap.org/';
 
+    /**
+     * @throws \maxh\Nominatim\Exceptions\NominatimException
+     */
     public function testNominatimFactory()
     {
-
         //Instance Nominatim
         $instance = new Nominatim($this->url);
         $this->assertInstanceOf(Nominatim::class, $instance);
@@ -39,8 +41,5 @@ public function testNominatimFactory()
 
         $baseLookup = $instance->newLookup();
         $this->assertEquals($lookup, $baseLookup);
-
-        //Testing Client
-        $this->assertInstanceOf('GuzzleHttp\\Client', $instance->getClient());
     }
 }
diff --git a/tests/ReverseTest.php b/tests/ReverseTest.php
index f47b10e..ae483e0 100644
--- a/tests/ReverseTest.php
+++ b/tests/ReverseTest.php
@@ -1,23 +1,35 @@
 <?php
+/**
+ * Class ReverseTest
+ *
+ * @package      maxh\Nominatim\Test
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
+ */
 
 namespace maxh\Nominatim\Test;
 
-use maxh\Nominatim\Nominatim;
-
 class ReverseTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $url = 'http://nominatim.openstreetmap.org/';
 
+    /**
+     * Contain url of the current application
+     * @var \maxh\Nominatim\Nominatim
+     */
     private $nominatim;
 
+    /**
+     * @throws \maxh\Nominatim\Exceptions\NominatimException
+     */
     protected function setUp()
     {
-        $this->nominatim = new Nominatim($this->url);
+        $this->nominatim = new \maxh\Nominatim\Nominatim($this->url);
     }
 
     public function testAddress()
     {
+        /** @var \maxh\Nominatim\Reverse $reverse */
         $reverse = $this->nominatim->newReverse()
             ->latlon(43.4843941, -1.4960842);
 
diff --git a/tests/SearchTest.php b/tests/SearchTest.php
index 52076de..3218d59 100644
--- a/tests/SearchTest.php
+++ b/tests/SearchTest.php
@@ -1,19 +1,30 @@
 <?php
+/**
+ * Class SearchTest
+ *
+ * @package      maxh\Nominatim\Test
+ * @author       Maxime Hélias <maximehelias16@gmail.com>
+ */
 
 namespace maxh\Nominatim\Test;
 
-use maxh\Nominatim\Nominatim;
-
 class SearchTest extends \PHPUnit_Framework_TestCase
 {
 
     protected $url = 'http://nominatim.openstreetmap.org/';
 
+    /**
+     * Contain url of the current application
+     * @var \maxh\Nominatim\Nominatim
+     */
     private $nominatim;
 
+    /**
+     * @throws \maxh\Nominatim\Exceptions\NominatimException
+     */
     protected function setUp()
     {
-        $this->nominatim = new Nominatim($this->url);
+        $this->nominatim = new \maxh\Nominatim\Nominatim($this->url);
     }
 
     /**
@@ -21,6 +32,7 @@ protected function setUp()
      */
     public function testQuery()
     {
+        /** @var \maxh\Nominatim\Search $search */
         $search = $this->nominatim->newSearch()
             ->query('HelloWorld');