From 77eaa360930ca3d9efb7db8adaaf5df2b9444894 Mon Sep 17 00:00:00 2001
From: Iceman <iceman@iuse.se>
Date: Sun, 17 Feb 2019 11:07:48 +0100
Subject: [PATCH 1/2] Update README.md

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index effdc0f6e..c8c04f852 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,14 @@ This fork now compiles just fine on
 
 ## KALI and ARCHLINUX users
 Kali and ArchLinux users usually must kill their modem manager in order for the proxmark3 to enumerate properly.   
-`sudo apt remove modemmanager`
+```sh
+sudo apt remove modemmanager
+```
+or 
+```sh
+systemctl stop ModemManager
+systemctl disable ModemManager
+```
 
 ## Setup and build for UBUNTU
 GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS, 15.10 or 16.04

From f05ab29c04e8f6f9d4f4be36d0784f9f6dd7c0d4 Mon Sep 17 00:00:00 2001
From: Fl0-0 <Fl0-0@users.noreply.github.com>
Date: Sun, 17 Feb 2019 15:51:37 +0100
Subject: [PATCH 2/2] Fix for USB uart slowness

See Proxmark#787
---
 uart/uart_posix.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index cb878a4f0..093aaf363 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -68,9 +68,9 @@ typedef struct {
 } serial_port_unix;
 
 // Set time-out on 30 miliseconds
-const struct timeval timeout = {
+struct timeval timeout = {
   .tv_sec  =     0, // 0 second
-  .tv_usec = 300000  // 300 000 micro seconds
+  .tv_usec = 30000  // 30000 micro seconds
 };
 
 serial_port uart_open(const char* pcPortName)
@@ -89,6 +89,10 @@ serial_port uart_open(const char* pcPortName)
 
     char *colon = strrchr(addrstr, ':');
     char *portstr;
+
+    // Set time-out to 300 miliseconds only for TCP port
+    timeout.tv_usec = 300000;
+
     if (colon) {
       portstr = colon + 1;
       *colon = '\0';