diff --git a/docs/5.0/components/data-path.md b/docs/5.0/components/data-path.md
index 8c411ed4..d71fd49b 100644
--- a/docs/5.0/components/data-path.md
+++ b/docs/5.0/components/data-path.md
@@ -16,8 +16,8 @@ but also provide specific methods to work with Data URI paths.
 <?php
 class DataPath implements ComponentInterface
 {
-	public function __construct(?string $content = null): void
 	public static function createFromPath(string $path): self
+	public function __construct(?string $content = null): void
 	public function getMediaType(void): string
 	public function getMimeType(void): string
 	public function getParameters(void): string
diff --git a/docs/5.0/components/hierarchical-path.md b/docs/5.0/components/hierarchical-path.md
index 3c703618..0e739714 100644
--- a/docs/5.0/components/hierarchical-path.md
+++ b/docs/5.0/components/hierarchical-path.md
@@ -18,9 +18,9 @@ class HierarchicalPath implements ComponentInterface, IteratorAggregate, Countab
 {
 	const IS_RELATIVE = 0;
 	const IS_ABSOLUTE = 1;
+	public static function createFromSegments(iterable $data, int $type = self::IS_RELATIVE): self
 	public function __construct(?string $content = null): void
 	public function append(string $path): self
-	public static function createFromSegments($data, int $type = self::IS_RELATIVE): self
 	public function getBasename(void): string
 	public function getDirname(void): string
 	public function getExtension(void): string
diff --git a/docs/5.0/components/host.md b/docs/5.0/components/host.md
index a59d87b4..bab40234 100644
--- a/docs/5.0/components/host.md
+++ b/docs/5.0/components/host.md
@@ -18,10 +18,10 @@ class Host implements ComponentInterface, Countable, IteratorAggregate
 {
 	const IS_ABSOLUTE = 1;
 	const IS_RELATIVE = 0;
+	public static function createFromIp(string $ip): self
+	public static function createFromLabels(iterable $data, int $type = self::IS_RELATIVE): self
 	public function __construct(?string $content = null): void
 	public function append(string $host): self
-	public static function createFromIp(string $ip): self
-	public static function createFromLabels($data, int $type = self::IS_RELATIVE): self
 	public function getIp(void): string
 	public function getLabel(int $offset, $default = null): mixed
 	public function getLabels(void): array
@@ -269,7 +269,7 @@ echo $newHost; //displays 'shop.11.be'
 <?php
 const Host::IS_RELATIVE = 0;
 const Host::IS_ABSOLUTE = 1;
-public static Host::createFromLabels($data, int $type = self::IS_RELATIVE): self
+public static Host::createFromLabels(iterable $data, int $type = self::IS_RELATIVE): self
 public Host::isAbsolute(void): bool
 public Host::getLabels(void): array
 public Host::getLabel(int $offset, $default = null): mixed
diff --git a/docs/5.0/components/query.md b/docs/5.0/components/query.md
index 86a147e0..625f17c7 100644
--- a/docs/5.0/components/query.md
+++ b/docs/5.0/components/query.md
@@ -17,16 +17,17 @@ The library provides a `Query` class to ease query string creation and manipulat
 class Query implements ComponentInterface, Countable, IteratorAggregate
 {
 	public static function build(array $pairs[, string $separator = '&' [, int $enc_type = self::RFC3986_ENCODING]]): string
+	public static function createFromPairs(iterable $pairs[, string $separator = '&']): self
+	public static function createFromParams(iterable $params[, string $separator = '&']): self
 	public static function extract(string $query[, string $separator = '&' [, int $enc_type = self::RFC3986_ENCODING]]): array
 	public static function parse(string $query[, string $separator = '&' [, int $enc_type = self::RFC3986_ENCODING]]): array
-	public static function createFromPairs(array $pairs): self
-	public static function createFromParams(array $params): self
 	public function __construct(?string $content = null): void
 	public function append(string $query): self
 	public function getPair(string $name, mixed $default = null): mixed
 	public function getPairs(void): array
 	public function getParam(string $name, mixed $default = null): mixed
 	public function getParams(void): array
+	public function getSeparator(void): string
 	public function hasPair(string $name): bool
 	public function keys([mixed $value]): array
 	public function ksort(mixed sort): self
@@ -34,6 +35,7 @@ class Query implements ComponentInterface, Countable, IteratorAggregate
 	public function withoutNumericIndices(void): self
 	public function withoutPairs(array $offsets): self
 	public function withoutParams(array $offset): self
+	public function withSeparator(string $separator): self
 }
 
 //functions aliases
@@ -43,19 +45,146 @@ function extract_query(string $query[, string $separator = '&' [, int $enc_type
 function parse_query(string $query[, string $separator = '&' [, int $enc_type = self::RFC3986_ENCODING]]): array
 ~~~
 
-## Creating a new object using the default constructor
+## Basic usage
 
 ~~~php
 <?php
-public Query::__construct(?string $content = null): void
+public Query::__construct(?string $content = null, string $separator = '&'): void
+public Query::getSeparator(string $separator): self
+public Query::withSeparator(string $separator): self
+public Query::merge(string $query): self
+public Query::append(string $query): self
+public Query::ksort(mixed $sort): self
 ~~~
 
-<p class="message-notice">submitted string is normalized to be <code>RFC3986</code> compliant.</p>
+### The default constructor
+
+~~~php
+<?php
+public Query::__construct(?string $content = null, string $separator = '&'): void
+~~~
 
+<p class="message-info">The optional <code>$separator</code> argument was added in <code>version 1.3.0</code></p>
+<p class="message-notice">submitted string is normalized to be <code>RFC3986</code> compliant.</p>
 <p class="message-warning">If the submitted value is not valid a <code>League\Uri\Components\Exception</code> exception is thrown.</p>
 
 The `League\Uri\Components\Exception` extends PHP's SPL `InvalidArgumentException`.
 
+### Query::withSeparator
+
+`Query::withSeparator` returns a new `Query` object with an alternate string separator.
+
+~~~php
+<?php
+
+public Query::withSeparator(string $separator): Query
+~~~
+
+This method expects a single argument which is a string separator. If the separator is equal to `=` an exception will be thrown.
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query    = new Query('foo=bar&baz=toto');
+$newQuery = $query->withSeparator('|');
+$newQuery->__toString(); //return foo=bar|baz=toto
+~~~
+
+### Query::merge
+
+`Query::merge` returns a new `Query` object with its data merged.
+
+~~~php
+<?php
+
+public Query::merge(string $query): Query
+~~~
+
+This method expects a single argument which is a string
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query    = new Query('foo=bar&baz=toto');
+$newQuery = $query->merge('foo=jane&r=stone');
+$newQuery->__toString(); //return foo=jane&baz=toto&r=stone
+// the 'foo' parameter was updated
+// the 'r' parameter was added
+~~~
+
+<p class="message-info">Values equal to <code>null</code> or the empty string are merge differently.</p>
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query    = Query::createFromPairs(['foo' => 'bar', 'baz' => 'toto']);
+$newQuery = $query->merge('baz=&r');
+$newQuery->__toString(); //return foo=bar&baz=&r
+// the 'r' parameter was added without any value
+// the 'baz' parameter was updated to an empty string and its = sign remains
+~~~
+
+### Query::append
+
+`Query::append` returns a new `Query` object with its data append to it.
+
+~~~php
+<?php
+
+public Query::append(string $query): Query
+~~~
+
+This method expects a single argument which is a string
+
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query    = new Query('foo=bar&john=doe');
+$newQuery = $query->append('foo=baz');
+$newQuery->__toString(); //return foo=jane&foo=baz&john=doe
+// a new foo parameter is added
+~~~
+
+### Query::ksort
+
+`Query::ksort` returns a `Query` object with its pairs sorted according to its keys or a user defined function.
+
+The single argument `sort` can be:
+
+One of PHP's sorting constant used by the [sort function](http://php.net/sort). **In this case the query parameters are sorted from low to high** like PHP's [ksort function](http://php.net/ksort)
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query    = new Query('foo=bar&baz=toto');
+$newQuery = $query->ksort(SORT_STRING);
+$newQuery->__toString(); //return baz=toto&foo=bar
+~~~
+
+A user-defined comparison function which must return an integer less than, equal to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second, like PHP's [uksort function](http://php.net/uksort)
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+
+$query    = new Query('foo=bar&baz=toto');
+$newQuery = $query->ksort('strcmp');
+$newQuery->__toString(); //return baz=toto&foo=bar
+~~~
+
 ## Query as a PHP data transport layer
 
 ### Query::extract
@@ -108,6 +237,23 @@ $arr = Uri\extract_query($query_string);
 // $arr = ['foo.bar' => 'bar', 'foo_bar' => baz'];
 ~~~
 
+### Query::createFromParams
+
+<p class="message-info"><code>Query::createFromParams</code> is available since version <code>1.3.0</code></p>
+
+This named constructor takes any iterable construct and tries to recreate a `Query` object using internally `http_build_query`. This method takes 2 arguments:
+
+- `$params` : a iterable containing properties to transform into a query string;
+- `$separator`: the separator to be used when creating the query string representation;
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query = Query::createFromParams(['foo' => 'bar', 'filter' => ['status' => 'on', 'order' => 'desc']], '&amp;');
+echo $query->getContent(Query::NO_ENCODING); //return 'foo=bar&amp;filter[status]=on&amp;filter[order]=desc';
+~~~
 
 ### Query::getParams
 
@@ -143,6 +289,44 @@ $query->getParam('gweta', 'now'); //return 'now'
 
 The method returns the value of a specific argument. If the argument does not exist it will return the value specified by the second argument which defaults to `null`.
 
+
+### Query::withoutParams
+
+<p class="message-info"><code>Query::withoutParams</code> is available since version <code>1.3.0</code></p>
+
+If you want to remove PHP's variable from the query string you can use the `Query::withoutParams` method as shown below
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query = new Query('foo[]=bar&foo[]=y+olo&z=');
+$new_query = $query->withoutParams(['foo']);
+$new_query->getParam('foo'); //return null
+echo $new_query->getContent(Query::NO_ENCODING); //return 'z='
+~~~
+
+### Query::withoutNumericIndices
+
+<p class="message-info"><code>Query::withoutNumericIndices</code> is available since version <code>1.3.0</code></p>
+
+If your query string is created with `http_build_query` or the `Query::createFromParams` named constructor chances are that numeric indices have been added by the method. The `Query::withoutNumericIndices` removes any numeric index found in the query string as shown below:
+
+~~~php
+<?php
+
+use League\Uri\Components\Query;
+
+$query = Query::createFromParms('foo[]=bar&foo[]=baz');
+echo $query->getContent(Query::NO_ENCODING); //return 'foo[0]=bar&foo[1]=baz'
+$new_query = $query->withoutNumericIndices();
+echo $new_query->getContent(Query::NO_ENCODING); //return 'foo[]=bar&foo[]=baz'
+//of note both objects returns the same PHP's variables but differs regarding the pairs
+$query->getParams(); //return ['foo' => ['bar', 'baz']]
+$new_query->getParams(); //return ['foo' => ['bar', 'baz']]
+~~~
+
 ## Query as a collection of key/value pairs
 
 ~~~php
@@ -150,13 +334,14 @@ The method returns the value of a specific argument. If the argument does not ex
 
 public static Query::parse(string $query_string [, string $separator = '&' [, int $enc_type = self::RFC3986_ENCODING]]): array
 public static Query::build(array $pairs [, string $separator = '&' [, int $enc_type = self::RFC3986_ENCODING]]): string
-public static Query::createFromPairs(iterable $pairs): self
+public static Query::createFromPairs(iterable $pairs[, string $separator = '&']): self
 public Query::getIterator(): ArrayIterator
 public Query::count(): int
 public Query::getPairs(): array
 public Query::getPair(string $offset, $default = null): mixed
 public Query::hasPair(string $offset): bool
 public Query::keys([mixed $value = null]): array
+public Query::withoutPairs(array $offsets): self
 ~~~
 
 This class mainly represents the query string as a collection of key/value pairs.
@@ -258,6 +443,10 @@ Returns a new `Query` object from an `array` or a `Traversable` object.
 
 * `$pairs` : The submitted data must be an `array` or a `Traversable` key/value structure similar to the result of [Query::parse](#parsing-the-query-string-into-an-array).
 
+* `$separator` : The query string separator used for string representation. By default equals to `&`;
+
+<p class="message-info"><code>$separator</code> is availiabe since version <code>1.3.0</code>.</p>
+
 #### Examples
 
 ~~~php
@@ -372,79 +561,6 @@ $query->keys('gweta'); //return [];
 
 By default, the method returns all the keys, but if you supply a value, only the keys whose value equals the value are returned.
 
-## Manipulating the query
-
-~~~php
-<?php
-
-public Query::merge(string $query): self
-public Query::append(string $query): self
-public Query::ksort(mixed $sort): self
-public Query::withoutPairs(array $offsets): array
-~~~
-
-### Query::merge
-
-`Query::merge` returns a new `Query` object with its data merged.
-
-~~~php
-<?php
-
-public Query::merge(string $query): Query
-~~~
-
-This method expects a single argument which is a string
-
-~~~php
-<?php
-
-use League\Uri\Components\Query;
-
-$query    = new Query('foo=bar&baz=toto');
-$newQuery = $query->merge('foo=jane&r=stone');
-$newQuery->__toString(); //return foo=jane&baz=toto&r=stone
-// the 'foo' parameter was updated
-// the 'r' parameter was added
-~~~
-
-<p class="message-info">Values equal to <code>null</code> or the empty string are merge differently.</p>
-
-~~~php
-<?php
-
-use League\Uri\Components\Query;
-
-$query    = Query::createFromPairs(['foo' => 'bar', 'baz' => 'toto']);
-$newQuery = $query->merge('baz=&r');
-$newQuery->__toString(); //return foo=bar&baz=&r
-// the 'r' parameter was added without any value
-// the 'baz' parameter was updated to an empty string and its = sign remains
-~~~
-
-### Query::append
-
-`Query::append` returns a new `Query` object with its data append to it.
-
-~~~php
-<?php
-
-public Query::append(string $query): Query
-~~~
-
-This method expects a single argument which is a string
-
-
-~~~php
-<?php
-
-use League\Uri\Components\Query;
-
-$query    = new Query('foo=bar&john=doe');
-$newQuery = $query->append('foo=baz');
-$newQuery->__toString(); //return foo=jane&foo=baz&john=doe
-// a new foo parameter is added
-~~~
-
 ### Query::withoutPairs
 
 `Query::withoutPairs` returns a new `Query` object with deleted pairs according to their keys.
@@ -459,35 +575,4 @@ use League\Uri\Components\Query;
 $query    = new Query('foo=bar&p=y+olo&z=');
 $newQuery = $query->withoutPairs(['foo', 'p']);
 echo $newQuery; //displays 'z='
-~~~
-
-### Query::ksort
-
-`Query::ksort` returns a `Query` object with its pairs sorted according to its keys or a user defined function.
-
-The single argument `sort` can be:
-
-One of PHP's sorting constant used by the [sort function](http://php.net/sort). **In this case the query parameters are sorted from low to high** like PHP's [ksort function](http://php.net/ksort)
-
-~~~php
-<?php
-
-use League\Uri\Components\Query;
-
-$query    = new Query('foo=bar&baz=toto');
-$newQuery = $query->ksort(SORT_STRING);
-$newQuery->__toString(); //return baz=toto&foo=bar
-~~~
-
-A user-defined comparison function which must return an integer less than, equal to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second, like PHP's [uksort function](http://php.net/uksort)
-
-~~~php
-<?php
-
-use League\Uri\Components\Query;
-
-
-$query    = new Query('foo=bar&baz=toto');
-$newQuery = $query->ksort('strcmp');
-$newQuery->__toString(); //return baz=toto&foo=bar
 ~~~
\ No newline at end of file