diff --git a/README.md b/README.md
index c1d82514f76..69a5af8bc49 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Features
 Copyright and license
 =====================
 
-Copyright: 2016 Mashape, Inc.
+Copyright: (c) 2016-2017 Mashape, Inc.
 
 Author: Thijs Schreijer
 
@@ -35,6 +35,16 @@ use the `rbusted` script.
 History
 =======
 
+###0.3.1 (22-Feb-2017) Bugfix
+
+- Kubernetes dns returns an SRV record for individual nodes, where the target
+  is the same name again (hence causing a recursive loop). Now those entries
+  will be removed, and if nothing is left, it will fail the SRV lookup, causing
+  a fall-through to the next record type.
+- Kubernetes tends to return a port of 0 if none is provided/set, hence the
+  `toip()` function now ignores a `port=0` and falls back on the port passed
+  in.
+
 ###0.3.0 (8-Nov-2016) Major breaking update
 
 - breaking: renamed a lot of things; method names, module names, etc. pretty
diff --git a/docs/index.html b/docs/index.html
index 1ee8838f8c7..9c0008019d8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -73,8 +73,8 @@ <h2>Topics</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
-<i style="float:right;">Last updated 2016-11-08 22:07:36 </i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i style="float:right;">Last updated 2017-02-22 13:40:23 </i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/modules/resty.dns.balancer.html b/docs/modules/resty.dns.balancer.html
index 23fa70a89d7..50dad8814c2 100644
--- a/docs/modules/resty.dns.balancer.html
+++ b/docs/modules/resty.dns.balancer.html
@@ -149,7 +149,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">hostname</span>
-         hostname to add (note: not validated, as long as it&rsquo;s a
+         hostname to add (note: not validated, as long as it's a
  string it will be accepted, but remain unresolved!)
         </li>
         <li><span class="parameter">port</span>
@@ -214,7 +214,8 @@ <h3>Returns:</h3>
     <strong>new (opts)</strong>
     </dt>
     <dd>
-    <p>Creates a new balancer.  The balancer is based on a wheel with slots. The
+
+<p>Creates a new balancer.  The balancer is based on a wheel with slots. The
  slots will be randomly distributed over the targets. The number of slots
  assigned will be relative to the weight.</p>
 
@@ -225,35 +226,34 @@ <h3>Returns:</h3>
 <p> The options table has the following fields;</p>
 
 <ul>
-<li><code>hosts</code> (optional) containing hostnames, ports and weights. If omitted,
-ports and weights default respectively to 80 and 10. The list will be sorted
-before being added, so the order of entry is deterministic.</li>
-<li><code>wheelSize</code> (optional) for total number of slots in the balancer, if omitted
-the size of <code>order</code> is used, or 1000 if <code>order</code> is not provided. It is important
-to have enough slots to keep the ring properly randomly distributed. If there
-are to few slots for the number of targets then the load distribution might
-become to coarse. Consider the maximum number of targets expected, as new
-hosts can be dynamically added, and dns renewals might yield larger record
-sets. The <code>wheelSize</code> cannot be altered, only a new wheel can be created, but
-then all consistency would be lost. On a similar note; making it too big,
-will have a performance impact when the wheel is modified as too many slots
-will have to be moved between targets. A value of 50 to 200 slots per entry
-seems about right.</li>
-<li><code>order</code> (optional) if given, a list of random numbers, size <code>wheelSize</code>, used to
-randomize the wheel. This entry is solely to support multiple servers with
-the same consistency, as it allows to use the same randomization on each
-server, and hence the same slot assignment. Duplicates are not allowed in
-the list.</li>
-<li><code>dns</code> (required) a configured <a href="../modules/resty.dns.client.html">dns.client</a> object for querying the dns server.</li>
-<li><code>requery</code> (optional) interval of requerying the dns server for previously
-failed queries. Defaults to 1 if omitted (in seconds)</li>
-<li><code>ttl0</code> (optional) Maximum lifetime for records inserted with ttl=0, to verify
-the ttl is still 0. Defaults to 60 if omitted (in seconds)</li>
+    <li><code>hosts</code> (optional) containing hostnames, ports and weights. If omitted,
+    ports and weights default respectively to 80 and 10. The list will be sorted
+    before being added, so the order of entry is deterministic.</li>
+    <li><code>wheelSize</code> (optional) for total number of slots in the balancer, if omitted
+    the size of <code>order</code> is used, or 1000 if <code>order</code> is not provided. It is important
+    to have enough slots to keep the ring properly randomly distributed. If there
+    are to few slots for the number of targets then the load distribution might
+    become to coarse. Consider the maximum number of targets expected, as new
+    hosts can be dynamically added, and dns renewals might yield larger record
+    sets. The <code>wheelSize</code> cannot be altered, only a new wheel can be created, but
+    then all consistency would be lost. On a similar note; making it too big,
+    will have a performance impact when the wheel is modified as too many slots
+    will have to be moved between targets. A value of 50 to 200 slots per entry
+    seems about right.</li>
+    <li><code>order</code> (optional) if given, a list of random numbers, size <code>wheelSize</code>, used to
+    randomize the wheel. This entry is solely to support multiple servers with
+    the same consistency, as it allows to use the same randomization on each
+    server, and hence the same slot assignment. Duplicates are not allowed in
+    the list.</li>
+    <li><code>dns</code> (required) a configured <a href="../modules/resty.dns.client.html">dns.client</a> object for querying the dns server.</li>
+    <li><code>requery</code> (optional) interval of requerying the dns server for previously
+    failed queries. Defaults to 1 if omitted (in seconds)</li>
+    <li><code>ttl0</code> (optional) Maximum lifetime for records inserted with ttl=0, to verify
+    the ttl is still 0. Defaults to 60 if omitted (in seconds)</li>
 </ul>
 
 
 
-
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">opts</span>
@@ -319,8 +319,8 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
-<i style="float:right;">Last updated 2016-11-08 22:07:36 </i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i style="float:right;">Last updated 2017-02-22 13:40:23 </i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/modules/resty.dns.client.html b/docs/modules/resty.dns.client.html
index 0215938f246..8ef4ef18b60 100644
--- a/docs/modules/resty.dns.client.html
+++ b/docs/modules/resty.dns.client.html
@@ -32,9 +32,9 @@ <h1>lua-resty-dns-client</h1>
 
 <h2>Contents</h2>
 <ul>
-<li><a href="#Caching">Caching</a></li>
-<li><a href="#Resolving">Resolving</a></li>
-<li><a href="#Socket_functions">Socket functions</a></li>
+<li><a href="#Caching">Caching </a></li>
+<li><a href="#Resolving">Resolving </a></li>
+<li><a href="#Socket_functions">Socket functions </a></li>
 </ul>
 
 
@@ -55,22 +55,24 @@ <h2>Topics</h2>
 
 <h1>Module <code>resty.dns.client</code></h1>
 <p>DNS client.</p>
-<p><p> Works with OpenResty only. Requires the <a href="https://github.com/openresty/lua-resty-dns"><code>lua-resty-dns</code></a> module.</p>
+<p>
+
+
+<p> Works with OpenResty only. Requires the <a href="https://github.com/openresty/lua-resty-dns"><code>lua-resty-dns</code></a> module.</p>
 
 <p> <em>NOTES</em>: </p>
 
 <ol>
-<li>parsing the config files upon initialization uses blocking i/o, so use with
-care. See <a href="../modules/resty.dns.client.html#init">init</a> for details.</li>
-<li>All returned records are directly from the cache. <em>So do not modify them!</em>
-If you need to, copy them first.</li>
-<li>TTL for records is the TTL returned by the server at the time of fetching
-and won&rsquo;t be updated while the client serves the records from its cache.</li>
-<li>resolving IPv4 (A-type) and IPv6 (AAAA-type) addresses is explicitly supported. If
-the hostname to be resolved is a valid IP address, it will be cached with a ttl of
-10 years. So the user doesn&rsquo;t have to check for ip adresses.</li>
+    <li>parsing the config files upon initialization uses blocking i/o, so use with
+    care. See <a href="../modules/resty.dns.client.html#init">init</a> for details.</li>
+    <li>All returned records are directly from the cache. <em>So do not modify them!</em>
+    If you need to, copy them first.</li>
+    <li>TTL for records is the TTL returned by the server at the time of fetching
+    and won't be updated while the client serves the records from its cache.</li>
+    <li>resolving IPv4 (A-type) and IPv6 (AAAA-type) addresses is explicitly supported. If
+    the hostname to be resolved is a valid IP address, it will be cached with a ttl of
+    10 years. So the user doesn't have to check for ip adresses.</li>
 </ol>
-
 </p>
     <h3>Info:</h3>
     <ul>
@@ -80,14 +82,14 @@ <h3>Info:</h3>
     </ul>
 
 
-<h2><a href="#Caching">Caching</a></h2>
+<h2><a href="#Caching">Caching </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#purgeCache">purgeCache (touched)</a></td>
 	<td class="summary">Cleanup the DNS client cache.</td>
 	</tr>
 </table>
-<h2><a href="#Resolving">Resolving</a></h2>
+<h2><a href="#Resolving">Resolving </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#init">init (options)</a></td>
@@ -106,7 +108,7 @@ <h2><a href="#Resolving">Resolving</a></h2>
 	<td class="summary">Resolves to an IP and port number.</td>
 	</tr>
 </table>
-<h2><a href="#Socket_functions">Socket functions</a></h2>
+<h2><a href="#Socket_functions">Socket functions </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#connect">connect (sock, host, port, opts)</a></td>
@@ -122,7 +124,7 @@ <h2><a href="#Socket_functions">Socket functions</a></h2>
 <br/>
 
 
-    <h2 class="section-header has-description"><a name="Caching"></a>Caching</h2>
+    <h2 class="section-header has-description"><a name="Caching"></a>Caching </h2>
 
           <div class="section-description">
            The cache will not update the <code>ttl</code> field. So every time the same record
@@ -163,7 +165,7 @@ <h3>Returns:</h3>
 
 </dd>
 </dl>
-    <h2 class="section-header has-description"><a name="Resolving"></a>Resolving</h2>
+    <h2 class="section-header has-description"><a name="Resolving"></a>Resolving </h2>
 
           <div class="section-description">
            When resolving names, queries will be synchronized, such that only a single
@@ -248,7 +250,8 @@ <h3>Usage:</h3>
     <strong>resolve (qname, r_opts, dnsCacheOnly, r)</strong>
     </dt>
     <dd>
-    <p>Resolve a name.<br/>
+
+<p>Resolve a name. <br/>
  If <code>r_opts.qtype</code> is given, then it will fetch that specific type only. If
  <code>r_opts.qtype</code> is not provided, then it will try to resolve
  the name using the record types, in the order as provided to <a href="../modules/resty.dns.client.html#init">init</a>.</p>
@@ -260,20 +263,19 @@ <h3>Usage:</h3>
  it (the first time) as;</p>
 
 <ul>
-<li>SRV, </li>
-<li>then A, </li>
-<li>then AAAA (success),</li>
-<li>then CNAME (after AAAA success, this will not be tried)</li>
+    <li>SRV, </li>
+    <li>then A, </li>
+    <li>then AAAA (success),</li>
+    <li>then CNAME (after AAAA success, this will not be tried)</li>
 </ul>
 
-
 <p> A second lookup will now try (assuming the cached entry expired);</p>
 
 <ul>
-<li>AAAA (as it was the last successful lookup),</li>
-<li>then SRV, </li>
-<li>then A,</li>
-<li>then CNAME.</li>
+    <li>AAAA (as it was the last successful lookup),</li>
+    <li>then SRV, </li>
+    <li>then A,</li>
+    <li>then CNAME.</li>
 </ul>
 
 
@@ -289,7 +291,7 @@ <h3>Parameters:</h3>
  <a href="https://github.com/openresty/lua-resty-dns">OpenResty docs</a> for more options.
         </li>
         <li><span class="parameter">dnsCacheOnly</span>
-         Only check the cache, won&rsquo;t do server lookups
+         Only check the cache, won't do server lookups
  (will not invalidate any ttl expired data and will hence possibly return
  expired data)
         </li>
@@ -323,7 +325,7 @@ <h3>Returns:</h3>
  A server error table is returned as <code>nil+error+r</code> (where <a href="https://www.lua.org/manual/5.1/manual.html#pdf-error">error</a> is a string
  extracted from the server error table).
  An empty response is returned as <code>response+error+r</code> (where <a href="https://www.lua.org/manual/5.1/manual.html#pdf-error">error</a> is
- &lsquo;dns query returned no results&rsquo;).
+ 'dns query returned no results').
 
 
 
@@ -349,7 +351,8 @@ <h3>Usage:</h3>
     <strong>toip (qname, port, dnsCacheOnly, r)</strong>
     </dt>
     <dd>
-    <p>Resolves to an IP and port number.
+
+<p>Resolves to an IP and port number.
  Builds on top of <a href="../modules/resty.dns.client.html#resolve">resolve</a>, but will also further dereference SRV type records.</p>
 
 <p> When calling multiple times on cached records, it will apply load-balancing
@@ -360,31 +363,29 @@ <h3>Usage:</h3>
 
 <p> <strong>Example</strong>;</p>
 
-<p> SRV record for &ldquo;my.domain.com&rdquo;, containing 2 entries (this is the 1st level);</p>
+<p> SRV record for "my.domain.com", containing 2 entries (this is the 1st level);</p>
 
 <ul>
-<li> <code>target = 127.0.0.1, port = 80, weight = 10</code></li>
-<li> <code>target = &quot;other.domain.com&quot;, port = 8080, weight = 5</code></li>
+    <li><code>target = 127.0.0.1, port = 80, weight = 10</code></li>
+    <li><code>target = &quot;other.domain.com&quot;, port = 8080, weight = 5</code></li>
 </ul>
 
-
-<p> A record for &ldquo;other.domain.com&rdquo;, containing 2 entries (this is the 2nd level);</p>
+<p> A record for "other.domain.com", containing 2 entries (this is the 2nd level);</p>
 
 <ul>
-<li> <code>ip = 127.0.0.2</code></li>
-<li> <code>ip = 127.0.0.3</code></li>
+    <li><code>ip = 127.0.0.2</code></li>
+    <li><code>ip = 127.0.0.3</code></li>
 </ul>
 
-
 <p> Now calling <code>local ip, port = toip(&quot;my.domain.com&quot;, 123)</code> in a row 6 times will result in;</p>
 
 <ul>
-<li> <code>127.0.0.1, 80</code></li>
-<li> <code>127.0.0.2, 8080</code> (port from SRV, 1st IP from A record)</li>
-<li> <code>127.0.0.1, 80</code>   (completes WRR 1st level, 1st run)</li>
-<li> <code>127.0.0.3, 8080</code> (port from SRV, 2nd IP from A record, completes RR 2nd level)</li>
-<li> <code>127.0.0.1, 80</code></li>
-<li> <code>127.0.0.1, 80</code>   (completes WRR 1st level, 2nd run, with different order as WRR is randomized)</li>
+    <li><code>127.0.0.1, 80</code></li>
+    <li><code>127.0.0.2, 8080</code> (port from SRV, 1st IP from A record)</li>
+    <li><code>127.0.0.1, 80</code>   (completes WRR 1st level, 1st run)</li>
+    <li><code>127.0.0.3, 8080</code> (port from SRV, 2nd IP from A record, completes RR 2nd level)</li>
+    <li><code>127.0.0.1, 80</code></li>
+    <li><code>127.0.0.1, 80</code>   (completes WRR 1st level, 2nd run, with different order as WRR is randomized)</li>
 </ul>
 
 
@@ -397,10 +398,10 @@ <h3>Parameters:</h3>
         </li>
         <li><span class="parameter">port</span>
          (optional) default port number to return if none was found in
- the lookup chain (only SRV records carry port information)
+ the lookup chain (only SRV records carry port information, SRV with <code>port=0</code> will be ignored)
         </li>
         <li><span class="parameter">dnsCacheOnly</span>
-         Only check the cache, won&rsquo;t do server lookups (will
+         Only check the cache, won't do server lookups (will
  not invalidate any ttl expired data and will hence possibly return expired data)
         </li>
         <li><span class="parameter">r</span>
@@ -421,7 +422,7 @@ <h3>Returns:</h3>
 
 </dd>
 </dl>
-    <h2 class="section-header "><a name="Socket_functions"></a>Socket functions</h2>
+    <h2 class="section-header "><a name="Socket_functions"></a>Socket functions </h2>
 
     <dl class="function">
     <dt>
@@ -502,8 +503,8 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
-<i style="float:right;">Last updated 2016-11-08 22:07:36 </i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i style="float:right;">Last updated 2017-02-22 13:40:23 </i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/modules/resty.dns.utils.html b/docs/modules/resty.dns.utils.html
index 8ae5872094e..63b7bac28cb 100644
--- a/docs/modules/resty.dns.utils.html
+++ b/docs/modules/resty.dns.utils.html
@@ -33,9 +33,9 @@ <h1>lua-resty-dns-client</h1>
 <h2>Contents</h2>
 <ul>
 <li><a href="#Fields">Fields</a></li>
-<li><a href="#Parsing_configuration_files_and_variables">Parsing configuration files and variables</a></li>
-<li><a href="#Caching_configuration_files_and_variables">Caching configuration files and variables</a></li>
-<li><a href="#Miscellaneous">Miscellaneous</a></li>
+<li><a href="#Parsing_configuration_files_and_variables">Parsing configuration files and variables </a></li>
+<li><a href="#Caching_configuration_files_and_variables">Caching configuration files and variables </a></li>
+<li><a href="#Miscellaneous">Miscellaneous </a></li>
 </ul>
 
 
@@ -56,6 +56,8 @@ <h2>Topics</h2>
 
 <h1>Module <code>resty.dns.utils</code></h1>
 <p>DNS utility module.</p>
+<p> </p>
+
 <p> Parses the <code>/etc/hosts</code> and <code>/etc/resolv.conf</code> configuration files, caches them,
  and provides some utility functions. </p>
 
@@ -79,7 +81,7 @@ <h2><a href="#Fields">Fields</a></h2>
 	<td class="summary">Default filename to parse for the <code>resolv.conf</code> file.</td>
 	</tr>
 </table>
-<h2><a href="#Parsing_configuration_files_and_variables">Parsing configuration files and variables</a></h2>
+<h2><a href="#Parsing_configuration_files_and_variables">Parsing configuration files and variables </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#applyEnv">applyEnv (config)</a></td>
@@ -94,7 +96,7 @@ <h2><a href="#Parsing_configuration_files_and_variables">Parsing configuration f
 	<td class="summary">Parses a <code>resolv.conf</code> file or table.</td>
 	</tr>
 </table>
-<h2><a href="#Caching_configuration_files_and_variables">Caching configuration files and variables</a></h2>
+<h2><a href="#Caching_configuration_files_and_variables">Caching configuration files and variables </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#getHosts">getHosts (ttl)</a></td>
@@ -105,7 +107,7 @@ <h2><a href="#Caching_configuration_files_and_variables">Caching configuration f
 	<td class="summary">returns the <a href="../modules/resty.dns.utils.html#applyEnv">applyEnv</a> results, but cached.</td>
 	</tr>
 </table>
-<h2><a href="#Miscellaneous">Miscellaneous</a></h2>
+<h2><a href="#Miscellaneous">Miscellaneous </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#hostnameType">hostnameType (name)</a></td>
@@ -159,7 +161,7 @@ <h2 class="section-header "><a name="Fields"></a>Fields</h2>
 
 </dd>
 </dl>
-    <h2 class="section-header "><a name="Parsing_configuration_files_and_variables"></a>Parsing configuration files and variables</h2>
+    <h2 class="section-header "><a name="Parsing_configuration_files_and_variables"></a>Parsing configuration files and variables </h2>
 
     <dl class="function">
     <dt>
@@ -286,7 +288,7 @@ <h3>See also:</h3>
 
 </dd>
 </dl>
-    <h2 class="section-header "><a name="Caching_configuration_files_and_variables"></a>Caching configuration files and variables</h2>
+    <h2 class="section-header "><a name="Caching_configuration_files_and_variables"></a>Caching configuration files and variables </h2>
 
     <dl class="function">
     <dt>
@@ -356,7 +358,7 @@ <h3>See also:</h3>
 
 </dd>
 </dl>
-    <h2 class="section-header "><a name="Miscellaneous"></a>Miscellaneous</h2>
+    <h2 class="section-header "><a name="Miscellaneous"></a>Miscellaneous </h2>
 
     <dl class="function">
     <dt>
@@ -400,8 +402,8 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
-<i style="float:right;">Last updated 2016-11-08 22:07:36 </i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i style="float:right;">Last updated 2017-02-22 13:40:23 </i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/topics/readme.md.html b/docs/topics/readme.md.html
index c7147a75a36..8cb56d5391a 100644
--- a/docs/topics/readme.md.html
+++ b/docs/topics/readme.md.html
@@ -47,7 +47,8 @@ <h2>Modules</h2>
 
 <div id="content">
 
-    <h1>Overview</h1>
+
+<h1>Overview</h1>
 
 <p>Lua library containing a dns client, several utilities, and a load-balancer.</p>
 
@@ -57,19 +58,18 @@ <h1>Overview</h1>
 <h1>Features</h1>
 
 <ul>
-<li>resolves A, AAAA, CNAME and SRV records, including port</li>
-<li>parses <code>/etc/hosts</code></li>
-<li>parses <code>/resolv.conf</code> and applies <code>LOCALDOMAIN</code> and <code>RES_OPTIONS</code> variables</li>
-<li>caches dns query results in memory</li>
-<li>synchronizes requests (a single request for many requestors, eg. when cached ttl expires under heavy load)</li>
-<li><code>toip</code> applies a local (weighted) round-robin scheme on the query results</li>
-<li>ring-balancer for round-robin and consistent-hashing approaches</li>
+    <li>resolves A, AAAA, CNAME and SRV records, including port</li>
+    <li>parses <code>/etc/hosts</code></li>
+    <li>parses <code>/resolv.conf</code> and applies <code>LOCALDOMAIN</code> and <code>RES_OPTIONS</code> variables</li>
+    <li>caches dns query results in memory</li>
+    <li>synchronizes requests (a single request for many requestors, eg. when cached ttl expires under heavy load)</li>
+    <li><code>toip</code> applies a local (weighted) round-robin scheme on the query results</li>
+    <li>ring-balancer for round-robin and consistent-hashing approaches</li>
 </ul>
 
-
 <h1>Copyright and license</h1>
 
-<p>Copyright: 2016 Mashape, Inc.</p>
+<p>Copyright: (c) 2016-2017 Mashape, Inc.</p>
 
 <p>Author: Thijs Schreijer</p>
 
@@ -82,47 +82,56 @@ <h1>Testing</h1>
 
 <h1>History</h1>
 
-<h3>0.3.0 (8-Nov-2016) Major breaking update</h3>
+<h3>0.3.1 (22-Feb-2017) Bugfix</h3>
 
 <ul>
-<li>breaking: renamed a lot of things; method names, module names, etc. pretty
-much breaks everything&hellip; also releasing under a new name</li>
-<li>feature: udp function <code>setpeername</code> added (client)</li>
-<li>fix: do not synchronize dns queries for ttl=0 requests (client)</li>
-<li>fix: full test coverage and accompanying fixes (ring-balancer)</li>
-<li>feature: auto-retry for failed dns queries (ring-balancer)</li>
-<li>feature: updating weights is now supported without removing/re-adding (ring-balancer)</li>
-<li>change: auto-retry interval configurable for failed dns queries (ring-balancer)</li>
-<li>change: max life-time interval configurable for ttl=0 dns records (ring-balancer)</li>
+    <li>Kubernetes dns returns an SRV record for individual nodes, where the target
+    is the same name again (hence causing a recursive loop). Now those entries
+    will be removed, and if nothing is left, it will fail the SRV lookup, causing
+    a fall-through to the next record type.</li>
+    <li>Kubernetes tends to return a port of 0 if none is provided/set, hence the
+    <code>toip()</code> function now ignores a <code>port=0</code> and falls back on the port passed
+    in.</li>
 </ul>
 
+<h3>0.3.0 (8-Nov-2016) Major breaking update</h3>
+
+<ul>
+    <li>breaking: renamed a lot of things; method names, module names, etc. pretty
+    much breaks everything... also releasing under a new name</li>
+    <li>feature: udp function <code>setpeername</code> added (client)</li>
+    <li>fix: do not synchronize dns queries for ttl=0 requests (client)</li>
+    <li>fix: full test coverage and accompanying fixes (ring-balancer)</li>
+    <li>feature: auto-retry for failed dns queries (ring-balancer)</li>
+    <li>feature: updating weights is now supported without removing/re-adding (ring-balancer)</li>
+    <li>change: auto-retry interval configurable for failed dns queries (ring-balancer)</li>
+    <li>change: max life-time interval configurable for ttl=0 dns records (ring-balancer)</li>
+</ul>
 
 <h3>0.2.1 (24-Oct-2016) Bugfix</h3>
 
 <ul>
-<li>fix: <code>toip()</code> failed on SRV records with only 1 entry</li>
+    <li>fix: <code>toip()</code> failed on SRV records with only 1 entry</li>
 </ul>
 
-
 <h3>0.2 (18-Oct-2016) Added the balancer</h3>
 
 <ul>
-<li>fix: was creating resolver objects even if serving from cache</li>
-<li>change: change resolver order (SRV is now first by default) for dns servers that create both SRV and A records for each entry</li>
-<li>feature: make resolver order configurable</li>
-<li>feature: ring-balancer (experimental, no full test coverage yet)</li>
-<li>other: more test coverage for the dns client</li>
+    <li>fix: was creating resolver objects even if serving from cache</li>
+    <li>change: change resolver order (SRV is now first by default) for dns servers that create both SRV and A records for each entry</li>
+    <li>feature: make resolver order configurable</li>
+    <li>feature: ring-balancer (experimental, no full test coverage yet)</li>
+    <li>other: more test coverage for the dns client</li>
 </ul>
 
-
 <h3>0.1 (09-Sep-2016) Initial released version</h3>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.5</a></i>
-<i style="float:right;">Last updated 2016-11-08 22:07:36 </i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i style="float:right;">Last updated 2017-02-22 13:40:23 </i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/lua-resty-dns-client-0.3.0-1.rockspec b/lua-resty-dns-client-0.3.0-1.rockspec
deleted file mode 100644
index 970719a82dc..00000000000
--- a/lua-resty-dns-client-0.3.0-1.rockspec
+++ /dev/null
@@ -1,27 +0,0 @@
-package = "lua-resty-dns-client"
-version = "0.3.0-1"
-source = {
-  url = "https://github.com/Mashape/lua-resty-dns-client/archive/0.3.0.tar.gz",
-  dir = "lua-resty-dns-client-0.3.0"
-}
-description = {
-  summary = "DNS library",
-  detailed = [[
-    DNS client library. Including utilities to parse configuration files and
-    a ring-balancer for round-robin and consistent-hashing approaches.
-  ]],
-  homepage = "https://github.com/Mashape/lua-resty-dns-client",
-  license = "Apache 2.0"
-}
-dependencies = {
-  "lua >= 5.1, < 5.4",
-  "penlight > 1.1, < 2.0",
-}
-build = {
-  type = "builtin",
-  modules = {
-    ["resty.dns.utils"] = "src/resty/dns/utils.lua",
-    ["resty.dns.client"] = "src/resty/dns/client.lua",
-    ["resty.dns.balancer"] = "src/resty/dns/balancer.lua",
-  },
-}
diff --git a/spec/client_spec.lua b/spec/client_spec.lua
index c1191b3e1dc..69d918ce23a 100644
--- a/spec/client_spec.lua
+++ b/spec/client_spec.lua
@@ -481,6 +481,41 @@ describe("DNS client", function()
       assert.is_number(port)
       assert.is_not.equal(0, port)
     end)
+    it("port passing if SRV port=0",function()
+      assert(client.init())
+      local ip, port, host 
+
+      host = "srvport0.thijsschreijer.nl"
+      ip, port = client.toip(host, 10)
+      assert.is_string(ip)
+      assert.is_number(port)
+      assert.is_equal(10, port)
+      
+      ip, port = client.toip(host)
+      assert.is_string(ip)
+      assert.is_nil(port)
+    end)
+    it("recursive SRV pointing to itself",function()
+      assert(client.init())
+      local ip, record, port, host 
+      host = "srvrecurse.thijsschreijer.nl"
+      
+      -- resolve SRV specific should return the record including its
+      -- recursive entry
+      record, err = client.resolve(host, { qtype = client.TYPE_SRV })
+      assert.is_table(record)
+      assert.equal(1, #record)
+      assert.equal(host, record[1].target)
+      assert.equal(host, record[1].name)
+      assert.is_nil(err)
+      
+      -- default order, SRV, A; the recursive SRV record fails, and it falls
+      -- back to the IP4 address
+      ip, port = client.toip(host)
+      assert.is_string(ip)
+      assert.is_equal("10.0.0.44", ip)
+      assert.is_nil(port)
+    end)
     it("resolving in correct record-type order",function()
       local function config()
         -- function to insert 2 records in the cache
diff --git a/src/resty/dns/client.lua b/src/resty/dns/client.lua
index e2bb39c266e..88317b33100 100644
--- a/src/resty/dns/client.lua
+++ b/src/resty/dns/client.lua
@@ -598,13 +598,33 @@ local function resolve(qname, r_opts, dnsCacheOnly, r, count)
         if not dnsCacheOnly then 
           cachesetsuccess(qname, qtype) -- set last succesful type resolved
         end
-        if qtype ~= _M.TYPE_CNAME then
-          return records, nil, r
-        else
+        if qtype == _M.TYPE_CNAME then
           -- dereference CNAME
           opts.qtype = nil
           return resolve(records[1].cname, opts, dnsCacheOnly, r, (count and count+1 or 1))
         end
+        if qtype == _M.TYPE_SRV then
+          -- check for recursive records
+          local cnt = 0
+          for i, record in ipairs(records) do
+            if record.target == qname then
+              -- recursive record, pointing to itself
+              cnt = cnt + 1
+            end
+            if cnt == #records then
+              -- fully recursive SRV record, specific Kubernetes problem
+              -- which generates a SRV record for each host, pointing to 
+              -- itself, hence causing a recursion loop.
+              -- So we delete the record, set an error, so it falls through
+              -- and retries other record types in the main loop here.
+              records = nil
+              err = "recursive SRV record"
+            end
+          end
+        end
+        if records and qtype ~= _M.TYPE_CNAME then
+          return records, nil, r
+        end
       end
     end
   end
@@ -795,7 +815,7 @@ end
 -- @function toip
 -- @param qname hostname to resolve
 -- @param port (optional) default port number to return if none was found in 
--- the lookup chain (only SRV records carry port information)
+-- the lookup chain (only SRV records carry port information, SRV with `port=0` will be ignored)
 -- @param dnsCacheOnly Only check the cache, won't do server lookups (will 
 -- not invalidate any ttl expired data and will hence possibly return expired data)
 -- @param r (optional) dns resolver object to use, it will also be returned. 
@@ -812,7 +832,8 @@ local function toip(qname, port, dnsCacheOnly, r)
   if rec[1].type == _M.TYPE_SRV then
     local entry = rec[roundRobinW(rec)]
     -- our SRV entry might still contain a hostname, so recurse, with found port number
-    return toip(entry.target, entry.port, dnsCacheOnly, r)
+    local srvport = (entry.port ~= 0 and entry.port) or port -- discard port if it is 0
+    return toip(entry.target, srvport, dnsCacheOnly, r)
   else
     -- must be A or AAAA
     return rec[roundRobin(rec)].address, port, r