diff --git a/.gitignore b/.gitignore
index 190da4c..fd7687d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 *.project
 mcrcon
 todo
+*.plist
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18613fb..9ccc0d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,21 @@
-####Version history:
-######0.6.1
+#### Version history:
+
+###### 0.7.1
+ - Add workaround to prevent server-side bug.
+   https://bugs.mojang.com/browse/MC-154617
+
+###### 0.7.0
+ - Add -w option for rcon command throttling
+    * Thanks HorlogeSkynet @ Github
+
+###### 0.6.2
+ - Set default address to localhost
+
+###### 0.6.1
  - Color coding fixed
     * Thanks to Hagb @ Github
 
-######0.6.0
+###### 0.6.0
  - Version numbering changed to more sane system (0.0.5 -> 0.6.0)
  - Fixed munged output
  - Support for using environment variables to set some basic options
@@ -14,7 +26,7 @@
  - Man page added 
  - Proper makefile added
 
-######0.0.5
+###### 0.0.5
   - IPv6 support!
      * Thanks to 'Tanja84dk' for addressing the real need of IPv6.
 
@@ -34,20 +46,20 @@
 
   - Client now tries to clean the incoming socket data if last package was out of spec.
 
-######0.0.4
+###### 0.0.4
   - Reverted back to default getopts options error handler (opterr = 1).
     Custom error handler requires rewriting.
   - Some cosmetic changes in program output strings.
   - Program usage(); function now waits for enter before exiting on Windows.
 
-######0.0.3
+###### 0.0.3
   - Colors are now supported on Windows too!
   - Terminal mode is now triggered with "-t" flag. "-i" flag still works for
     backwards compatibility.
   - Bug fixes (Packet size check always evaluating false and color validity
     check always evaluating true).
 
-######0.0.2
+###### 0.0.2
   - License changed from 'ISC License' to 'zlib/libpng License'.
   - Bug fixes & code cleanups
   - Interactive mode (-i flag). Client acts as interactive terminal.
@@ -55,25 +67,9 @@
     If connecting or authentication fails, the return value is -1.
   - Colors are now enabled by default. Now '-c' flag disables the color support.
 
-######0.0.1
+###### 0.0.1
   - Added experimental support for bukkit colors.
     Should work with any sh compatible shell.
   - Packet string data limited to max 2048 (DATA_BUFFSIZE) bytes.
     No idea how Minecraft handles multiple rcon packets.
     If someone knows, please mail me so I can implement it.
-
-####TODO:
-  - Make the receive buffer dynamic??
-  - Change some of the packet size issues to fatal errors.
-  - Code cleanups.
-  - Check global variables (remove if possible).
-  - Add some protocol checks (proper packet id check etc..).
-  - Preprocessor (#ifdef / #ifndef) cleanups.
-  - Follow valve rcon protocol standard strictly?
-  - Multiple packet support if minecraft supports it?!
-  - Investigate if player chat messages gets sent through rcon.
-    If they are, the messaging system requires rewriting.
-  - Name resolving should be integrated to connection creation function.
-  - Dont try to cleanup the socket if not authenticated
-  - Better sockets error reporting
-  - Better error function (VA_ARGS support)
diff --git a/INSTALL.md b/INSTALL.md
index d91f314..6a3bec9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,15 +1,15 @@
-Compiling and installing
+Building and installing
 ------------------------
 
-Only dependency is C library with POSIX getopt support. 
+Only dependency is C library and POSIX getopt support. 
 
 Compiling with GCC or CLANG:
 
     cc -std=gnu99 -Wpedantic -Wall -Wextra -Os -s -o mcrcon mcrcon.c
     
-Note: on Window remember to link with winsockets by adding "-lws2_32" to your compiler command line.
+Note: on Windows remember to link with winsock by adding `-lws2_32` to your compiler command line.
 
-Or you can just run "make":
+Or you can just run "**make**":
 
     make           - compiles mcrcon
     make install   - installs compiled binaries and manpage to the system
@@ -19,4 +19,4 @@ Or you can just run "make":
         /usr/local/bin/mcrcon
         /usr/local/share/man/man1/mcrcon.1
 
-Makefile "install" and "uninstall" rules are disabled on windows.
+Makefile "**install**" and "**uninstall**" rules are disabled on windows.
diff --git a/LICENSE b/LICENSE
index a3e4a6e..2db5c06 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2016, Tiiffi <tiiffi_at_gmail_dot_com>
+Copyright (c) 2012-2019, Tiiffi <tiiffi at gmail>
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages
@@ -17,4 +17,5 @@ freely, subject to the following restrictions:
   misrepresented as being the original software.
 
   3. This notice may not be removed or altered from any source
-  distribution.
\ No newline at end of file
+  distribution.
+  
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 25d14c5..c755128 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,23 @@
-# if you want to cross compile
-# export PATH=$PATH:/path/to/compiler/bin
-# export CROSS_COMPILE=arm-none-linux-gnueabi-
-# make
+# if you want to cross compile:
+#   export PATH=$PATH:/path/to/compiler/bin
+#   export CROSS_COMPILE=arm-none-linux-gnueabi-
+#   make
+#
+# Windows cross compile:
+#   i686-w64-mingw32-gcc -std=gnu99 -Wall -Wextra -Wpedantic -Os -s -o mcrcon.exe mcrcon.c -lws2_32
 
 EXENAME = mcrcon
 PREFIX ?= /usr/local
 
-EXTRAFLAGS ?= -fstack-protector-strong
-
 INSTALL = install
 LINKER =
-RM = rm -f
+RM = rm -v -f
+
+CC = gcc
+CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
+EXTRAFLAGS ?= -fstack-protector-strong
 
 ifeq ($(OS), Windows_NT)
-    CC = gcc
 	LINKER = -lws2_32
 	EXENAME = mcrcon.exe
 	RM = cmd /C del /F
@@ -21,9 +25,7 @@ endif
 
 ifeq ($(shell uname), Darwin)
 	INSTALL = ginstall
-	CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os
-else
-	CFLAGS ?= -std=gnu99 -Wall -Wextra -Wpedantic -Os -s
+	CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -Os
 endif
 
 .PHONY: all
@@ -35,13 +37,13 @@ $(EXENAME): mcrcon.c
 ifneq ($(OS), Windows_NT)
 .PHONY: install
 install:
-	$(INSTALL) -vD $(EXENAME) $(PREFIX)/bin/$(EXENAME)
-	$(INSTALL) -vD -m 0644 mcrcon.1 $(PREFIX)/share/man/man1/mcrcon.1
+	$(INSTALL) -vD $(EXENAME) $(DESTDIR)$(PREFIX)/bin/$(EXENAME)
+	$(INSTALL) -vD -m 0644 mcrcon.1 $(DESTDIR)$(PREFIX)/share/man/man1/mcrcon.1
 	@echo "\nmcrcon installed. Run 'make uninstall' if you want to uninstall.\n"
 
 .PHONY: uninstall
 uninstall:
-	rm -f $(PREFIX)/bin/$(EXENAME) $(PREFIX)/share/man/man1/mcrcon.1
+	$(RM) $(DESTDIR)$(PREFIX)/bin/$(EXENAME) $(DESTDIR)$(PREFIX)/share/man/man1/mcrcon.1
 	@echo "\nmcrcon uninstalled.\n"
 endif
 
diff --git a/README.md b/README.md
index 4da3169..7be3247 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,31 @@
+<<<<<<< HEAD
+### Installing:
+=======
+# mcrcon
+>>>>>>> develop
+
+mcrcon is console based Minecraft [rcon](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol) client for remote administration and server maintenance scripts.
+
+---
+
 ### Installing:
 
-from sources:
+##### via packet manager:
+See https://pkgs.org/download/mcrcon for available packages in various Linux distros (note that available packages might be outdated).
+
+- Gentoo Linux: https://packages.gentoo.org/packages/games-util/mcrcon
+- Arch Linux: https://aur.archlinux.org/packages/mcrcon/
+
+##### building from sources:
 ```sh
 git clone https://github.com/Tiiffi/mcrcon.git
 cd mcrcon
 make
 sudo make install
 ```
-Check **INSTALL** for more details.
+Check [INSTALL.md](INSTALL.md) for more details.
 
-You can also download precompiled binaries*: https://github.com/Tiiffi/mcrcon/releases/latest
+Precompiled binaries (if provided)*: https://github.com/Tiiffi/mcrcon/releases/latest
 
 <sub>*At the moment binaries are provided for Linux and Windows.</sub>
 
@@ -22,33 +38,42 @@ Sends rcon commands to Minecraft server.
 
 ```
 Option:
-  -h            Print usage
-  -H            Server address
-  -P            Port (default is 25575)
+  -H            Server address (default: localhost)
+  -P            Port (default: 25575)
   -p            Rcon password
-  -t            Interactive terminal mode
-  -s            Silent mode (do not print received packets)
+  -t            Terminal mode
+  -s            Silent mode
   -c            Disable colors
-  -r            Output raw packets (debugging and custom handling)
-  -v            Output version information
+  -r            Output raw packets
+  -w            Wait for specified duration (seconds) between each command (1 - 600s)
+  -h            Print usage
+  -v            Version information
 ```
-Commands with arguments must be enclosed in quotes.
-
 Server address, port and password can be set using following environment variables:
 ```
 MCRCON_HOST
 MCRCON_PORT
 MCRCON_PASS
 ```
-Note that command-line options will override environment variables.
+###### Notes:
+- mcrcon will start in terminal mode if no commands are given
+- Command-line options will override environment variables
+- Rcon commands with spaces must be enclosed in quotes
 
 Example:
-  ```mcrcon -H my.minecraft.server -p password "say Server is restarting!" save-all stop```
+> Send three commands ("say", "save-all", "stop") and wait five seconds between the commands.
+
+  ```mcrcon -H my.minecraft.server -p password -w 5 "say Server is restarting!" save-all stop```
 
 ---
 
+<<<<<<< HEAD
 ### Enable rcon on server
 Remember to enable rcon by adding following lines to ```server.properties``` file.
+=======
+##### Enable rcon on server
+Remember to enable rcon by adding following lines to [```server.properties```](https://minecraft.gamepedia.com/Server.properties) file.
+>>>>>>> develop
 ```
 enable-rcon=true
 rcon.port=25575
@@ -57,14 +82,24 @@ rcon.password=your_rcon_pasword
 
 ---
 
+<<<<<<< HEAD
 #### Contact:
+=======
+##### Contact:
+>>>>>>> develop
 
 * WWW:            https://github.com/Tiiffi/mcrcon/
-* MAIL:           tiiffi_at_gmail_dot_com
+* MAIL:           tiiffi at gmail
 * IRC:            tiiffi @ quakenet
 * BUG REPORTS:    https://github.com/Tiiffi/mcrcon/issues/
 
 ---
 
+### License
+
+This project is licensed under the zlib License - see the [LICENSE](LICENSE) file for details.
+
+---
+
 <sub>Master:</sub> ![Master build](https://api.travis-ci.org/Tiiffi/mcrcon.svg?branch=master)
 <sub>Develop:</sub> ![Develop build](https://api.travis-ci.org/Tiiffi/mcrcon.svg?branch=develop)
diff --git a/mcrcon.1 b/mcrcon.1
index 33245bf..3fb80fa 100644
--- a/mcrcon.1
+++ b/mcrcon.1
@@ -1,9 +1,9 @@
 .\" Process this file with
 .\" groff -man -Tascii mcrcon.1
 .\"
-.TH MCRCON 1 "December 2016" "Version 0.6.1"
+.TH MCRCON 1 "December 2019" "Version 0.7.1"
 .SH NAME 
-mcrcon \- sends rcon commands to a Minecraft server
+mcrcon \- send rcon commands to a Minecraft server
 .SH SYNOPSIS
 .B mcrcon [
 options
@@ -11,31 +11,34 @@ options
 commands
 .B ]
 .SH DESCRIPTION
-mcrcon is Minecraft rcon client / terminal with bukkit coloring support.
-It is well suited for remote administration and server maintenance scripts.
+mcrcon is Minecraft rcon client for remote administration and server maintenance scripts.
 .SH OPTIONS
-.IP -h
-Print usage
 .IP -H
-Server address
+Server address (default: localhost)
 .IP -P
-Port (default is 25575)
+Port (default: 25575)
 .IP -p
 Rcon password
 .IP -t
-Interactive terminal mode
+Terminal mode
 .IP -s
-Silent mode (do not print received packets)
+Silent mode
 .IP -c
 Disable colors
 .IP -r
-Output raw packets (for debugging and custom handling)
+Output raw packets
+.IP -w
+Wait for specified duration (seconds) between each command (1 - 600s)
+.IP -h
+Print usage
 .IP -v
 Output version information
 .PP
-Commands with arguments must be enclosed in quotes.
-.SH ENVIRONMENTAL VARIABLES
-Server address, port and password can be set using following environment variables:
+Commands with spaces must be enclosed in quotes.
+.br
+mcrcon will start in terminal mode if no commands are given.
+.SH ENVIRONMENT VARIABLES
+Server address, port and password can be set with following environment variables:
 .PP
 \fBMCRCON_HOST
 .br
@@ -55,9 +58,9 @@ Send "weather clear" command to server using custom port 1337
 \fBmcrcon\fR -H my.minecraft.server -P 1337 -p password "weather clear"
 .RE
 .PP
-Send three commands to server (say, save-all and stop)
+Send three commands ("say", "save-all", "stop") and wait five seconds between the commands.
 .RS
-\fBmcrcon\fR -H my.minecraft.server -p password "say Server is restarting!" save-all stop
+\fBmcrcon\fR -H my.minecraft.server -p password -w 5 "say Server is restarting!" save-all stop
 .RE
 .SH BUGS
-Bugs can be reported to \fBtiiffi_at_gmail_dot_com\fR or \fBhttps://github.com/Tiiffi/mcrcon/issues/\fR
+Report bugs to \fBtiiffi+mcrcon at gmail\fR or \fBhttps://github.com/Tiiffi/mcrcon/issues/\fR
diff --git a/mcrcon.c b/mcrcon.c
index 1d94ddd..b5d694a 100644
--- a/mcrcon.c
+++ b/mcrcon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016, Tiiffi <tiiffi -> gmail_dot_com>
+ * Copyright (c) 2012-2019, Tiiffi <tiiffi at gmail>
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -29,10 +29,11 @@
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
+#include <limits.h>
 
 #ifdef _WIN32
     // for name resolving on windows
-    // enable this if you get compiler whine about getaddrinfo on windows
+    // enable this if you get compiler whine about getaddrinfo() on windows
     //#define _WIN32_WINNT 0x0501
 
     #include <ws2tcpip.h>
@@ -46,7 +47,7 @@
     #include <netdb.h>
 #endif
 
-#define VERSION "0.6.1"
+#define VERSION "0.7.1"
 #define IN_NAME "mcrcon"
 #define VER_STR IN_NAME" "VERSION" (built: "__DATE__" "__TIME__")"
 
@@ -56,8 +57,7 @@
 #define RCON_AUTH_RESPONSE      2
 #define RCON_PID                0xBADC0DE
 
-// a bit too big perhaps?
-#define DATA_BUFFSIZE 10240
+#define DATA_BUFFSIZE 4096
 
 // rcon packet structure
 typedef struct _rc_packet {
@@ -65,54 +65,50 @@ typedef struct _rc_packet {
     int id;
     int cmd;
     char data[DATA_BUFFSIZE];
-    // ignoring string2 atm.
+    // ignoring string2 for now
 } rc_packet;
 
+
 // ===================================
 //  FUNCTION DEFINITIONS              
 // ===================================
 
-// endianness related functions
-bool    is_bigendian(void);
-int32_t reverse_int32(int32_t n);
-
 // Network related functions
 #ifdef _WIN32
-void		net_init_WSA(void);
+void        net_init_WSA(void);
 #endif
-void		net_close(int sd);
-int		net_connect(const char *host, const char *port);
-int		net_send(int sd, const uint8_t *buffer, size_t size);
-int		net_send_packet(int sd, rc_packet *packet);
-rc_packet*	net_recv_packet(int sd);
-int		net_clean_incoming(int sd, int size);
+void        net_close(int sd);
+int         net_connect(const char *host, const char *port);
+int         net_send(int sd, const uint8_t *buffer, size_t size);
+int         net_send_packet(int sd, rc_packet *packet);
+rc_packet*  net_recv_packet(int sd);
+int         net_clean_incoming(int sd, int size);
 
 // Misc stuff
-void		usage(void);
+void        usage(void);
 #ifndef _WIN32
-void		print_color(int color);
+void        print_color(int color);
 #endif
-int		get_line(char *buffer, int len);
-int		run_terminal_mode(int rsock);
-int		run_commands(int argc, char *argv[]);
+int         get_line(char *buffer, int len);
+int         run_terminal_mode(int sock);
+int         run_commands(int argc, char *argv[]);
 
 // Rcon protocol related functions
-rc_packet*	packet_build(int id, int cmd, char *s1);
-uint8_t		*packet_build_malloc(size_t *size, int32_t id, int32_t cmd, char *string);
-void		packet_print(rc_packet *packet);
-
-int		rcon_auth(int rsock, char *passwd);
-int		rcon_command(int rsock, char *command);
+rc_packet*  packet_build(int id, int cmd, char *s1);
+void        packet_print(rc_packet *packet);
+int         rcon_auth(int sock, char *passwd);
+int         rcon_command(int sock, char *command);
 
 
 // =============================================
 //  GLOBAL VARIABLES
 // =============================================
-static int raw_output = 0;
-static int silent_mode = 0;
-static int print_colors = 1;
-static int connection_alive = 1;
-static int rsock;
+static int global_raw_output = 0;
+static int global_silent_mode = 0;
+static int global_disable_colors = 0;
+static int global_connection_alive = 1;
+static int global_rsock;
+static int global_wait_seconds = 0;
 
 #ifdef _WIN32
   // console coloring on windows
@@ -122,85 +118,96 @@ static int rsock;
 // safety stuff (windows is still misbehaving)
 void exit_proc(void)
 {
-	if (rsock != -1)
-		net_close(rsock);
+	if (global_rsock != -1)
+		net_close(global_rsock);
 }
 
 // Check windows & linux behaviour !!!
 void sighandler(/*int sig*/)
 {
-	connection_alive = 0;
+	global_connection_alive = 0;
 	#ifndef _WIN32
 	    exit(EXIT_SUCCESS);
 	#endif
 }
 
+#define MAX_WAIT_TIME 600
+
+unsigned int mcrcon_parse_seconds(char *str)
+{
+	char *end;
+	long result = strtol(str, &end, 10);
+
+	if (errno != 0) {
+		fprintf(stderr, "-w invalid value.\nerror %d: %s\n", errno, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
+	if (end == str) {
+		fprintf(stderr, "-w invalid value (not a number?)\n");
+		exit(EXIT_FAILURE);
+	}
+
+	if (result <= 0 || result > MAX_WAIT_TIME) {
+		fprintf(stderr, "-w value out of range.\nAcceptable value is 1 - %d (seconds).\n", MAX_WAIT_TIME);
+		exit(EXIT_FAILURE);
+	}
+
+	return (unsigned int) result;
+}
+
 int main(int argc, char *argv[])
 {
-	int opt;
 	int terminal_mode = 0;
 
 	char *host = getenv("MCRCON_HOST");
 	char *pass = getenv("MCRCON_PASS");
 	char *port = getenv("MCRCON_PORT");
 	
-	if (!port)
-		port = "25575";
+	if (!port) port = "25575";
+	if (!host) host = "localhost";
 
-	if(argc < 2 && host == NULL && pass == NULL)
-		usage();
+	if(argc < 1 && pass == NULL) usage();
 
 	// default getopt error handler enabled
 	opterr = 1;
-
-	while ((opt = getopt(argc, argv, "vrtcshH:p:P:i")) != -1)
+	int opt;
+	while ((opt = getopt(argc, argv, "vrtcshw:H:p:P:")) != -1)
 	{
-		switch (opt)
-		{
-			case 'H': host = optarg;	break;
-			case 'P': port = optarg;	break;
-			case 'p': pass = optarg;	break;
-			case 'C':
-			case 'c': print_colors = 0;	break;
-			case 'S':
-			case 's': silent_mode = 1;	break;
-			case 'T':
-			case 't':
-			case 'I':
-			case 'i': terminal_mode = 1;	break;
-			case 'r': raw_output = 1;	break;
-			case 'v':
-				puts(VER_STR"\nhttps://github.com/Tiiffi/mcrcon");
-				exit(EXIT_SUCCESS);
+		switch (opt) {
+			case 'H': host = optarg;                break;
+			case 'P': port = optarg;                break;
+			case 'p': pass = optarg;                break;
+			case 'c': global_disable_colors = 1;    break;
+			case 's': global_silent_mode = 1;       break;
+			case 'i': /* reserved for interp mode */break;
+			case 't': terminal_mode = 1;            break;
+			case 'r': global_raw_output = 1;        break;
+			case 'w':
+				global_wait_seconds = mcrcon_parse_seconds(optarg);
 			break;
-			case 'h':
-			case '?': usage();		break;
-			/*
-			  if(optopt == 'P' || optopt == 'H' || optopt == 'p')
-		    	  fprintf (stderr, "Option -%c requires an argument.\n\n", optopt);
-			  else fprintf (stderr, "Unknown option -%c\n\n", optopt);
-			*/
 
-			default: exit(EXIT_FAILURE);
+			case 'v':
+				puts(VER_STR" - https://github.com/Tiiffi/mcrcon");
+				puts("Bug reports:\n\ttiiffi+mcrcon at gmail\n\thttps://github.com/Tiiffi/mcrcon/issues/");
+				exit(EXIT_SUCCESS);
+
+			case 'h': usage(); break;
+			case '?':
+			default:
+				puts("Try 'mcrcon -h' or 'man mcrcon' for help.");
+				exit(EXIT_FAILURE);
 		}
 	}
 
-	if (host == NULL)
-	{
-		fputs("Host not defined (-H flag). Try 'mcrcon -h' or 'man mcrcon' for more information.\n\n", stdout);
-		return 0;
-	}
-
-	if (pass == NULL)
-	{
-		fputs("Password not defined (-p flag). Try 'mcrcon -h' 'man mcrcon' for more information.\n\n", stdout);
+	if (pass == NULL) {
+		puts("You must give password (-p password).\nTry 'mcrcon -h' or 'man mcrcon' for help.");
 		return 0;
 	}
 
 	if(optind == argc && terminal_mode == 0)
 		terminal_mode = 1;
 
-
 	// safety features to prevent "IO: Connection reset" bug on the server side
 	atexit(&exit_proc);
 	signal(SIGABRT, &sighandler);
@@ -208,57 +215,63 @@ int main(int argc, char *argv[])
 	signal(SIGINT, &sighandler);
 
 	#ifdef _WIN32
-	    net_init_WSA();
-	    console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
-	    if (console_handle == INVALID_HANDLE_VALUE) console_handle = NULL;
+		net_init_WSA();
+		console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
+		if (console_handle == INVALID_HANDLE_VALUE)
+			console_handle = NULL;
 	#endif
 
 	// open socket
-	rsock = net_connect(host, port);
+	global_rsock = net_connect(host, port);
+
+	int exit_code = EXIT_SUCCESS;
 
 	// auth & commands
-	if (rcon_auth(rsock, pass))
-	{
+	if (rcon_auth(global_rsock, pass)) {
 		if (terminal_mode)
-			run_terminal_mode(rsock);
+			run_terminal_mode(global_rsock);
 		else
-			run_commands(argc, argv);
+			exit_code = run_commands(argc, argv);
 	}
-	else // auth failed
+	else { // auth failed
 		fprintf(stdout, "Authentication failed!\n");
+		exit_code = EXIT_FAILURE;
+	}
 
-	net_close(rsock);
-	rsock = -1;
+	net_close(global_rsock);
+	global_rsock = -1;
 
-	return EXIT_SUCCESS;
+	return exit_code;
 }
 
 void usage(void)
 {
-	fputs(
-		"Usage: "IN_NAME" [OPTIONS]... [COMMANDS]...\n\n"
-		"Sends rcon commands to Minecraft server.\n\n"
-		"Option:\n"
-		"  -h\t\tPrint usage\n"
-		"  -H\t\tServer address\n"
-		"  -P\t\tPort (default is 25575)\n"
+	puts(
+		"Usage: "IN_NAME" [OPTIONS] [COMMANDS]\n\n"
+		"Send rcon commands to Minecraft server.\n\n"
+		"Options:\n"
+		"  -H\t\tServer address (default: localhost)\n"
+		"  -P\t\tPort (default: 25575)\n"
 		"  -p\t\tRcon password\n"
-		"  -t\t\tInteractive terminal mode\n"
-		"  -s\t\tSilent mode (do not print received packets)\n"
+		"  -t\t\tTerminal mode\n"
+		"  -s\t\tSilent mode\n"
 		"  -c\t\tDisable colors\n"
-		"  -r\t\tOutput raw packets (debugging and custom handling)\n"
-		"  -v\t\tOutput version information\n\n"
-		"Server address, port and password can be set using following environment variables:\n"
+		"  -r\t\tOutput raw packets\n"
+		"  -w\t\tWait for specified duration (seconds) between each command (1 - 600s)\n"
+		"  -h\t\tPrint usage\n"
+		"  -v\t\tVersion information\n\n"
+		"Server address, port and password can be set with following environment variables:\n"
 		"  MCRCON_HOST\n"
 		"  MCRCON_PORT\n"
-		"  MCRCON_PASS\n\n"
-		,stdout
+		"  MCRCON_PASS\n"
 	);
 
-	puts("Command-line options will override environment variables.");
-	puts("Rcon commands with arguments must be enclosed in quotes.\n");
-	puts("Example:\n\t"IN_NAME" -H my.minecraft.server -p password \"say Server is restarting!\" save-all stop\n");
-	puts(VER_STR"\nReport bugs to tiiffi_at_gmail_dot_com or https://github.com/Tiiffi/mcrcon/issues/\n");
+	puts (
+		"- mcrcon will start in terminal mode if no commands are given\n"
+		"- Command-line options will override environment variables\n"
+		"- Rcon commands with spaces must be enclosed in quotes\n"
+	);
+	puts("Example:\n\t"IN_NAME" -H my.minecraft.server -p password -w 5 \"say Server is restarting!\" save-all stop\n");
 
 	#ifdef _WIN32
 	    puts("Press enter to exit.");
@@ -278,8 +291,7 @@ void net_init_WSA(void)
 	WORD version = MAKEWORD(2, 2);
 
 	int err = WSAStartup(version, &wsadata);
-	if (err != 0)
-	{
+	if (err != 0) {
 		fprintf(stderr, "WSAStartup failed. Error: %d.\n", err);
 		exit(EXIT_FAILURE);
 	}
@@ -289,12 +301,12 @@ void net_init_WSA(void)
 // socket close and cleanup
 void net_close(int sd)
 {
-#ifdef _WIN32
-	closesocket(sd);
-	WSACleanup();
-#else
-	close(sd);
-#endif
+	#ifdef _WIN32
+		closesocket(sd);
+		WSACleanup();
+	#else
+		close(sd);
+	#endif
 }
 
 // Opens and connects socket
@@ -317,27 +329,26 @@ int net_connect(const char *host, const char *port)
 	#endif
 
 	int ret = getaddrinfo(host, port, &hints, &server_info);
-	if (ret != 0)
-	{
+	if (ret != 0) {
 		fprintf(stderr, "Name resolution failed.\n");
 		#ifdef _WIN32
 			fprintf(stderr, "Error %d: %s", ret, gai_strerror(ret));
 		#else
 			fprintf(stderr, "Error %d: %s\n", ret, gai_strerror(ret));
 		#endif
+
 		exit(EXIT_FAILURE);
 	}
 
 	// Go through the hosts and try to connect
-	for (p = server_info; p != NULL; p = p->ai_next)
-	{
+	for (p = server_info; p != NULL; p = p->ai_next) {
 		sd = socket(p->ai_family, p->ai_socktype, p->ai_protocol);
+
 		if (sd == -1)
 			continue;
 
 		ret = connect(sd, p->ai_addr, p->ai_addrlen);
-		if (ret == -1)
-		{
+		if (ret == -1) {
 			net_close(sd);
 			continue;
 		}
@@ -345,19 +356,18 @@ int net_connect(const char *host, const char *port)
 		break;
 	}
 
-	if (p == NULL)
-	{
+	if (p == NULL) {
 		/* TODO (Tiiffi): Check why windows does not report errors */
 		fprintf(stderr, "Connection failed.\n");
 		#ifndef _WIN32
 			fprintf(stderr, "Error %d: %s\n", errno, strerror(errno));
 		#endif
+
 		freeaddrinfo(server_info);
 		exit(EXIT_FAILURE);
 	}
 
 	freeaddrinfo(server_info);
-
 	return sd;
 }
 
@@ -366,11 +376,11 @@ int net_send(int sd, const uint8_t *buff, size_t size)
 	size_t sent = 0;
 	size_t left = size;
 
-	while (sent < size)
-	{
+	while (sent < size) {
 		int result = send(sd, (const char *) buff + sent, left, 0);
 
-		if (result == -1) return -1;
+		if (result == -1)
+			return -1;
 
 		sent += result;
 		left -= sent;
@@ -388,10 +398,9 @@ int net_send_packet(int sd, rc_packet *packet)
 
 	bytesleft = len = packet->size + sizeof(int);
 
-	while(total < len)
-	{
+	while (total < len) {
 		ret = send(sd, (char *) packet + total, bytesleft, 0);
-		if(ret == -1) { break; }
+		if(ret == -1) break;
 		total += ret;
 		bytesleft -= ret;
 	}
@@ -408,22 +417,19 @@ rc_packet *net_recv_packet(int sd)
 
 	int ret = recv(sd, (char *) &psize, sizeof(int), 0);
 
-	if (ret == 0)
-	{
+	if (ret == 0) {
 		fprintf(stderr, "Connection lost.\n");
-		connection_alive = 0;
+		global_connection_alive = 0;
 		return NULL;
 	}
 
-	if (ret != sizeof(int))
-	{
+	if (ret != sizeof(int)) {
 		fprintf(stderr, "Error: recv() failed. Invalid packet size (%d).\n", ret);
-		connection_alive = 0;
+		global_connection_alive = 0;
 		return NULL;
 	}
 
-	if (psize < 10 || psize > DATA_BUFFSIZE)
-	{
+	if (psize < 10 || psize > DATA_BUFFSIZE) {
 		fprintf(stderr, "Warning: invalid packet size (%d). Must over 10 and less than %d.\n", psize, DATA_BUFFSIZE);
 
 		if(psize > DATA_BUFFSIZE  || psize < 0) psize = DATA_BUFFSIZE;
@@ -434,19 +440,16 @@ rc_packet *net_recv_packet(int sd)
 
 	packet.size = psize;
 
-	ret = recv(sd, (char *) &packet + sizeof(int), psize, 0);
-	if (ret == 0)
-	{
-		fprintf(stderr, "Connection lost.\n");
-		connection_alive = 0;
-		return NULL;
-	}
+	int received = 0;
+	while (received < psize) {
+		ret = recv(sd, (char *) &packet + sizeof(int) + received, psize - received, 0);
+		if (ret == 0) { /* connection closed before completing receving */
+			fprintf(stderr, "Connection lost.\n");
+			global_connection_alive = 0;
+			return NULL;
+		}
 
-	if(ret != psize)
-	{
-		fprintf(stderr, "Warning: recv() return value (%d) does not match expected packet size (%d).\n", ret, psize);
-		net_clean_incoming(sd, DATA_BUFFSIZE); /* Should be enough. Needs some checking */
-		return NULL;
+		received += ret;
 	}
 
 	return &packet;
@@ -455,13 +458,11 @@ rc_packet *net_recv_packet(int sd)
 int net_clean_incoming(int sd, int size)
 {
 	char tmp[size];
-
 	int ret = recv(sd, tmp, size, 0);
 
-	if(ret == 0)
-	{
+	if(ret == 0) {
 		fprintf(stderr, "Connection lost.\n");
-		connection_alive = 0;
+		global_connection_alive = 0;
 	}
 
 	return ret;
@@ -471,8 +472,7 @@ void print_color(int color)
 {
 	// sh compatible color array
 	#ifndef _WIN32
-	char *colors[] =
-	{
+	char *colors[] = {
 		"\033[0;30m",   /* 00 BLACK     0x30 */
 		"\033[0;34m",   /* 01 BLUE      0x31 */
 		"\033[0;32m",   /* 02 GREEN     0x32 */
@@ -492,22 +492,22 @@ void print_color(int color)
 		"\033[4m"       /* 16 UNDERLINE 0x6e */
 	};
 
-	if(color == 0 || color == 0x72) /* 0x72: 'r' */
-	{
-		fputs("\033[0m", stdout); /* CANCEL COLOR */
-	}
+	/* 0x72: 'r' */
+	if (color == 0 || color == 0x72) fputs("\033[0m", stdout); /* CANCEL COLOR */
 	else
 	#endif
 	{
-		if(color >= 0x61 && color <= 0x66) color -= 0x57;
-		else if(color >= 0x30 && color <= 0x39) color -= 0x30;
-		else if(color == 0x6e) color=16; /* 0x6e: 'n' */
+		if (color >= 0x61 && color <= 0x66) color -= 0x57;
+		else if (color >= 0x30 && color <= 0x39)
+			color -= 0x30;
+		else if (color == 0x6e)
+			color = 16; /* 0x6e: 'n' */
 		else return;
 
 		#ifndef _WIN32
-		  fputs(colors[color], stdout);
+			fputs(colors[color], stdout);
 		#else
-		  SetConsoleTextAttribute(console_handle, color);
+			SetConsoleTextAttribute(console_handle, color);
 		#endif
 	}
 }
@@ -515,9 +515,10 @@ void print_color(int color)
 // this hacky mess might use some optimizing
 void packet_print(rc_packet *packet)
 {
-	if (raw_output == 1)
-	{
-		for (int i = 0; packet->data[i] != 0; ++i) putchar(packet->data[i]);
+	if (global_raw_output == 1) {
+		for (int i = 0; packet->data[i] != 0; ++i)
+			putchar(packet->data[i]);
+
 		return;
 	}
 
@@ -525,21 +526,17 @@ void packet_print(rc_packet *packet)
 	int def_color = 0;
 
 	#ifdef _WIN32
-	CONSOLE_SCREEN_BUFFER_INFO console_info;
-
-	if (GetConsoleScreenBufferInfo(console_handle, &console_info) != 0)
-		def_color = console_info.wAttributes + 0x30;
-	else
-		def_color = 0x37;
+		CONSOLE_SCREEN_BUFFER_INFO console_info;
+		if (GetConsoleScreenBufferInfo(console_handle, &console_info) != 0) {
+			def_color = console_info.wAttributes + 0x30;
+		} else def_color = 0x37;
 	#endif
 
 	// colors enabled so try to handle the bukkit colors for terminal
-	if (print_colors == 1)
-	{
-		for (i = 0; (unsigned char) packet->data[i] != 0; ++i)
-		{
+	if (global_disable_colors == 0) {
+		for (i = 0; (unsigned char) packet->data[i] != 0; ++i) {
 			if (packet->data[i] == 0x0A) print_color(def_color);
-			else if((unsigned char) packet->data[i] == 0xc2 && (unsigned char) packet->data[i+1] == 0xa7){
+			else if((unsigned char) packet->data[i] == 0xc2 && (unsigned char) packet->data[i+1] == 0xa7) {
 				print_color(packet->data[i+=2]);
 				continue;
 			}
@@ -548,11 +545,9 @@ void packet_print(rc_packet *packet)
 		print_color(def_color); // cancel coloring
 	}
 	// strip colors
-	else
-	{
-		for (i = 0; (unsigned char) packet->data[i] != 0; ++i)
-		{
-			if ((unsigned char) packet->data[i] == 0xc2 && (unsigned char) packet->data[i+1] == 0xa7){
+	else {
+		for (i = 0; (unsigned char) packet->data[i] != 0; ++i) {
+			if ((unsigned char) packet->data[i] == 0xc2 && (unsigned char) packet->data[i+1] == 0xa7) {
 				i+=2;
 				continue;
 			}	
@@ -561,8 +556,7 @@ void packet_print(rc_packet *packet)
 	}
 
 	// print newline if string has no newline
-	if (packet->data[i-1] != 10 && packet->data[i-1] != 13)
-		putchar('\n');
+	if (packet->data[i-1] != 10 && packet->data[i-1] != 13) putchar('\n');
 }
 
 rc_packet *packet_build(int id, int cmd, char *s1)
@@ -571,8 +565,7 @@ rc_packet *packet_build(int id, int cmd, char *s1)
 
 	// size + id + cmd + s1 + s2 NULL terminator
 	int s1_len = strlen(s1);
-	if (s1_len > DATA_BUFFSIZE)
-	{
+	if (s1_len > DATA_BUFFSIZE) {
 		fprintf(stderr, "Warning: Command string too long (%d). Maximum allowed: %d.\n", s1_len, DATA_BUFFSIZE);
 		return NULL;
 	}
@@ -585,67 +578,7 @@ rc_packet *packet_build(int id, int cmd, char *s1)
 	return &packet;
 }
 
-// TODO(Tiiffi): String length limit?
-uint8_t *packet_build_malloc(size_t *size, int32_t id, int32_t cmd, char *string)
-{
-	size_t string_length = strlen(string);
-
-	*size = 3 * sizeof(int32_t) + string_length + 2;
-	uint8_t *packet = malloc(*size);
-	if (packet == NULL) return NULL;
-
-	int32_t *p = (int32_t *) packet;
-	p[0] = (int32_t) *size - sizeof(int32_t);
-	p[1] = id;
-	p[2] = cmd;
-
-	memcpy(&p[3], string, string_length);
-
-	packet[12 + string_length] = 0;
-	packet[13 + string_length] = 0;
-
-	return packet;
-}
-
-// rcon packet structure
-#define MAX_PACKET_SIZE  (size_t) 1460 // including size member
-#define MIN_PACKET_SIZE  (size_t) 10
-#define MAX_STRING_SIZE  (size_t) (MAX_PACKET_SIZE - 2 - 3 * sizeof(int32_t))
-#define SIZEOF_PACKET(x) (size_t) (x.size + sizeof(int32_t))
-
-struct rcon_packet
-{
-	int32_t size;
-	int32_t id;
-	int32_t cmd;
-	uint8_t data[MAX_STRING_SIZE];
-};
-
-struct rcon_packet packet_build_new(int32_t id, int32_t cmd, char *string)
-{
-	struct rcon_packet packet;
-	size_t string_length = strlen(string);
-
-	if (string_length > MAX_STRING_SIZE)
-	{
-		string_length = MAX_STRING_SIZE;
-		fprintf(stderr,
-			"Warning: command string is too long. Truncating to "
-			"%u characters.\n", (unsigned) MAX_STRING_SIZE
-		);
-	}
-
-	packet.size = 2 * sizeof(int32_t) + string_length + 2;
-	packet.id = id;
-	packet.cmd = cmd;
-	memcpy(packet.data, string, string_length);
-	packet.data[string_length] = 0;
-	packet.data[string_length + 1] = 0;
-
-	return packet;
-}
-
-int rcon_auth(int rsock, char *passwd)
+int rcon_auth(int sock, char *passwd)
 {
 	int ret;
 
@@ -653,11 +586,11 @@ int rcon_auth(int rsock, char *passwd)
 	if (packet == NULL)
 		return 0;
 
-	ret = net_send_packet(rsock, packet);
+	ret = net_send_packet(sock, packet);
 	if (!ret)
 		return 0; // send failed
 
-	packet = net_recv_packet(rsock);
+	packet = net_recv_packet(sock);
 	if (packet == NULL)
 		return 0;
 
@@ -665,43 +598,26 @@ int rcon_auth(int rsock, char *passwd)
 	return packet->id == -1 ? 0 : 1;
 }
 
-int rcon_command(int rsock, char *command)
+int rcon_command(int sock, char *command)
 {
-	int ret; (void) ret;
-
-	size_t size;
-	uint8_t *p = packet_build_malloc(&size, RCON_PID, RCON_EXEC_COMMAND, command);
-	if (p == NULL)
-	{
-		connection_alive = 0;
+	rc_packet *packet = packet_build(RCON_PID, RCON_EXEC_COMMAND, command);
+	if (packet == NULL) {
+		global_connection_alive = 0;
 		return 0;
 	}
 
-	net_send(rsock, p, size);
+	net_send_packet(sock, packet);
 
-	free(p);
-
-	//ret = net_send_packet(rsock, packet);
-	//if(!ret) return 0; /* send failed */
-
-	rc_packet *packet;
-	packet = net_recv_packet(rsock);
+	packet = net_recv_packet(sock);
 	if (packet == NULL)
 		return 0;
 
 	if (packet->id != RCON_PID)
 		return 0;
 
-	if (!silent_mode)
-	{
-	/*
-	if(packet->size == 10) {
-	    printf("Unknown command \"%s\". Type \"help\" or \"?\" for help.\n", command);
-	}
-	else
-	*/
+	if (!global_silent_mode) {
 		if (packet->size > 10)
-			packet_print(packet);
+		packet_print(packet);
 	}
 
 	return 1;
@@ -709,33 +625,56 @@ int rcon_command(int rsock, char *command)
 
 int run_commands(int argc, char *argv[])
 {
-	int i, ok = 1, ret = 0;
+	int i = optind;
 
-	for (i = optind; i < argc && ok; i++)
-	{
-		ok = rcon_command(rsock, argv[i]);
-		ret += ok;
+	for (;;) {
+		if (!rcon_command(global_rsock, argv[i]))
+			return EXIT_FAILURE;
+
+		if (++i >= argc)
+			return EXIT_SUCCESS;
+
+		if (global_wait_seconds > 0) {
+			#ifdef _WIN32
+				Sleep(global_wait_seconds * 1000);
+			#else
+				sleep(global_wait_seconds);
+			#endif
+		}
 	}
-
-	return ret;
 }
 
 // interactive terminal mode
-int run_terminal_mode(int rsock)
+int run_terminal_mode(int sock)
 {
 	int ret = 0;
 	char command[DATA_BUFFSIZE] = {0x00};
 
-	puts("Logged in. Type \"Q\" to quit!");
+	puts("Logged in. Type 'quit' or 'exit' to quit.");
 
-	while (connection_alive)
-	{
+	while (global_connection_alive) {
+		putchar('>');
 		int len = get_line(command, DATA_BUFFSIZE);
+
+		if ((strcasecmp(command, "exit") && strcasecmp(command, "quit")) == 0)
+			break;
+
 		if(command[0] == 'Q' && command[1] == 0)
 			break;
 
-		if(len > 0 && connection_alive)
-			ret += rcon_command(rsock, command);
+		if(len > 0 && global_connection_alive)
+			ret += rcon_command(sock, command);
+
+		/* Special case for "stop" command to prevent server-side bug.
+		 * https://bugs.mojang.com/browse/MC-154617
+		 * 
+		 * NOTE: This is hacky workaround which should be handled better to
+		 *       ensure compatibility with other servers using source RCON.
+		 * NOTE: strcasecmp() is POSIX function.
+		 */
+		if (strcasecmp(command, "stop") == 0) {
+			break;
+		}
 
 		command[0] = len = 0;
 	}
@@ -746,44 +685,23 @@ int run_terminal_mode(int rsock)
 // gets line from stdin and deals with rubbish left in the input buffer
 int get_line(char *buffer, int bsize)
 {
-	int ch, len;
-
-	fputs(">", stdout);
-	(void) fgets(buffer, bsize, stdin);
+	char *ret = fgets(buffer, bsize, stdin);
+	if (ret == NULL)
+		exit(EXIT_FAILURE);
 
 	if (buffer[0] == 0)
-		connection_alive = 0;
+		global_connection_alive = 0;
 
 	// remove unwanted characters from the buffer
 	buffer[strcspn(buffer, "\r\n")] = '\0';
 
-	len = strlen(buffer);
+	int len = strlen(buffer);
 
 	// clean input buffer if needed 
-	if (len == bsize - 1)
+	if (len == bsize - 1) {
+		int ch;
 		while ((ch = getchar()) != '\n' && ch != EOF);
+	}
 
 	return len;
 }
-
-// http://www.ibm.com/developerworks/aix/library/au-endianc/
-bool is_bigendian(void)
-{
-	const int32_t n = 1;
-	if (*(uint8_t *) &n == 0 ) return true;
-	return false;
-}
-
-int32_t reverse_int32(int32_t n)
-{
-	int32_t tmp;
-	uint8_t *t = (uint8_t *) &tmp;
-	uint8_t *p = (uint8_t *) &n;
-
-	t[0] = p[3];
-	t[1] = p[2];
-	t[2] = p[1];
-	t[3] = p[0];
-
-	return tmp;
-}