diff --git a/README.md b/README.md
index 8e565017..4b9c8d58 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,8 @@ In practice, you probably want to run this instead:
 This keeps a persistent set of keys (and by extension, IP address) and gives you the option of editing the configuration file.
 If you want to use it as an overlay network on top of e.g. the internet, then you can do so by adding the remote devices domain/address and port (as a string, e.g. `"1.2.3.4:5678"`) to the list of `Peers` in the configuration file.
 
+A [Vyatta-based](https://github.com/neilalexander/vyatta-yggdrasil) router configuration is also available.
+
 ## Optional: advertise a prefix locally
 
 Suppose a node has generated the address: `fd00:1111:2222:3333:4444:5555:6666:7777`
diff --git a/src/yggdrasil/tun.go b/src/yggdrasil/tun.go
index b87528a3..c3ae4fe6 100644
--- a/src/yggdrasil/tun.go
+++ b/src/yggdrasil/tun.go
@@ -42,7 +42,7 @@ func (tun *tunDevice) read() error {
     if buf[0] & 0xf0 != 0x60 ||
        n != 256*int(buf[4]) + int(buf[5]) + IPv6_HEADER_LENGTH {
       // Either not an IPv6 packet or not the complete packet for some reason
-      panic("Should not happen in testing")
+      //panic("Should not happen in testing")
       continue
     }
     packet := append(util_getBytes(), buf[:n]...)