diff --git a/7DaysToDie/sdtdserver b/7DaysToDie/sdtdserver
index 7eca580bc..be8388813 100644
--- a/7DaysToDie/sdtdserver
+++ b/7DaysToDie/sdtdserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -50,6 +51,11 @@ githubbranch="master"
 # Steam
 appid="294420"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta latest_experimental"
+branch=""
+
 # Server Details
 servicename="sdtd-server"
 gamename="7 Days To Die"
diff --git a/ARKSurvivalEvolved/arkserver b/ARKSurvivalEvolved/arkserver
index 55b4f5d48..905a48b78 100644
--- a/ARKSurvivalEvolved/arkserver
+++ b/ARKSurvivalEvolved/arkserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="376030"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ark-server"
 gamename="ARK: Survivial Evolved"
diff --git a/Arma3/arma3server b/Arma3/arma3server
index 61756bbf6..5c3cea097 100644
--- a/Arma3/arma3server
+++ b/Arma3/arma3server
@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -64,10 +65,12 @@ githubrepo="LinuxGSM"
 githubbranch="master"
 
 # Steam
-# Stable
 appid="233780"
-# Development
-# appid="233780 -beta development"
+
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta development"
+branch=""
 
 # Server Details
 servicename="arma3-server"
diff --git a/Battlefield1942/bf1942server b/Battlefield1942/bf1942server
index ecc8d34f4..97851c553 100644
--- a/Battlefield1942/bf1942server
+++ b/Battlefield1942/bf1942server
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/BlackMesa/bmdmserver b/BlackMesa/bmdmserver
index 955a473d9..c28e35b1d 100644
--- a/BlackMesa/bmdmserver
+++ b/BlackMesa/bmdmserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -60,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="346680"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta public-beta"
+branch=""
+
 # Server Details
 servicename="bmdm-server"
 gamename="Black Mesa: Deathmatch"
diff --git a/BladeSymphony/bsserver b/BladeSymphony/bsserver
index bf652e27c..837ef62c8 100644
--- a/BladeSymphony/bsserver
+++ b/BladeSymphony/bsserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="228780"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta nightly -betapassword winteriscoming"
+branch=""
+
 # Server Details
 servicename="bs-server"
 gamename="Blade Symphony"
diff --git a/BrainBread2/bb2server b/BrainBread2/bb2server
index e07d4f748..78b57708e 100644
--- a/BrainBread2/bb2server
+++ b/BrainBread2/bb2server
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="030616"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="030616"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -60,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="475370"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta_branch"
+branch=""
+
 # Server Details
 servicename="bb2-server"
 gamename="BrainBread 2"
diff --git a/CodenameCURE/ccserver b/CodenameCURE/ccserver
index 18616fcce..150a8d3ac 100644
--- a/CodenameCURE/ccserver
+++ b/CodenameCURE/ccserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="383410"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="cc-server"
 gamename="Codename CURE"
diff --git a/CounterStrike/csserver b/CounterStrike/csserver
index 0eab77999..601a3eb93 100644
--- a/CounterStrike/csserver
+++ b/CounterStrike/csserver
@@ -19,6 +19,7 @@ version="060816"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/CounterStrikeConditionZero/csczserver b/CounterStrikeConditionZero/csczserver
index 69782958f..5d58f2314 100644
--- a/CounterStrikeConditionZero/csczserver
+++ b/CounterStrikeConditionZero/csczserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/CounterStrikeGlobalOffensive/csgoserver b/CounterStrikeGlobalOffensive/csgoserver
index 5502d5f0e..6fb3d9313 100755
--- a/CounterStrikeGlobalOffensive/csgoserver
+++ b/CounterStrikeGlobalOffensive/csgoserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/CounterStrikeSource/cssserver b/CounterStrikeSource/cssserver
index 4374586fc..f2a7cd590 100644
--- a/CounterStrikeSource/cssserver
+++ b/CounterStrikeSource/cssserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -60,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="232330"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease"
+branch=""
+
 # Server Details
 servicename="css-server"
 gamename="Counter-Strike: Source"
diff --git a/DayOfDefeat/dodserver b/DayOfDefeat/dodserver
index ee3342908..ceedba772 100644
--- a/DayOfDefeat/dodserver
+++ b/DayOfDefeat/dodserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/DayOfDefeatSource/dodsserver b/DayOfDefeatSource/dodsserver
index 7fc78db9d..9e576bcd7 100644
--- a/DayOfDefeatSource/dodsserver
+++ b/DayOfDefeatSource/dodsserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="232290"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease"
+branch=""
+
 # Server Details
 servicename="dods-server"
 gamename="Day of Defeat: Source"
diff --git a/DayOfInfamy/doiserver b/DayOfInfamy/doiserver
index b3a19f4d1..2b7fdb4ec 100644
--- a/DayOfInfamy/doiserver
+++ b/DayOfInfamy/doiserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -57,6 +58,11 @@ githubbranch="master"
 # Steam
 appid="462310"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="doi-server"
 gamename="Day of Infamy"
diff --git a/DeathmatchClassic/dmcserver b/DeathmatchClassic/dmcserver
index 68bd720f6..6d6425929 100644
--- a/DeathmatchClassic/dmcserver
+++ b/DeathmatchClassic/dmcserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/DontStarveTogether/dstserver b/DontStarveTogether/dstserver
index 1d7f571be..92002f8fb 100644
--- a/DontStarveTogether/dstserver
+++ b/DontStarveTogether/dstserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="130516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="130516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -53,6 +54,11 @@ githubbranch="master"
 # Steam
 appid="343050"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta anewreignbeta"
+branch=""
+
 # Server Details
 servicename="dst-server"
 gamename="Don't Starve Together"
diff --git a/DoubleActionBoogaloo/dabserver b/DoubleActionBoogaloo/dabserver
index 9ee35ceae..e8db62c58 100644
--- a/DoubleActionBoogaloo/dabserver
+++ b/DoubleActionBoogaloo/dabserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="317800"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="dab-server"
 gamename="Double Action: Boogaloo"
diff --git a/EmpiresMod/emserver b/EmpiresMod/emserver
index 5fbd9ba4e..5dfa54af1 100644
--- a/EmpiresMod/emserver
+++ b/EmpiresMod/emserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -60,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="460040"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="em-server"
 gamename="Empires Mod"
diff --git a/FistfulOfFrags/fofserver b/FistfulOfFrags/fofserver
index a5576bff5..59a896a20 100644
--- a/FistfulOfFrags/fofserver
+++ b/FistfulOfFrags/fofserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="295230"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="fof-server"
 gamename="Fistful of Frags"
diff --git a/GarrysMod/gmodserver b/GarrysMod/gmodserver
index c47e6e1d1..1eab6d643 100644
--- a/GarrysMod/gmodserver
+++ b/GarrysMod/gmodserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -76,6 +77,11 @@ githubbranch="master"
 # Steam
 appid="4020"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta dev"
+branch=""
+
 # Server Details
 servicename="gmod-server"
 gamename="Garry's Mod"
diff --git a/GoldenEyeSource/gesserver b/GoldenEyeSource/gesserver
index b80f2848f..9b9495e0c 100644
--- a/GoldenEyeSource/gesserver
+++ b/GoldenEyeSource/gesserver
@@ -19,6 +19,7 @@ version="300816"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/HalfLife2Deathmatch/hl2dmserver b/HalfLife2Deathmatch/hl2dmserver
index 6169474dc..e26a2b11c 100644
--- a/HalfLife2Deathmatch/hl2dmserver
+++ b/HalfLife2Deathmatch/hl2dmserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/HalfLifeDeathmatch/hldmserver b/HalfLifeDeathmatch/hldmserver
index 6cef66c32..10a32f7d7 100644
--- a/HalfLifeDeathmatch/hldmserver
+++ b/HalfLifeDeathmatch/hldmserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/HalfLifeDeathmatchSource/hldmsserver b/HalfLifeDeathmatchSource/hldmsserver
index 947a34a5c..ff040ab27 100644
--- a/HalfLifeDeathmatchSource/hldmsserver
+++ b/HalfLifeDeathmatchSource/hldmsserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/Hurtworld/hwserver b/Hurtworld/hwserver
index 5b6bffb94..2e28481b6 100644
--- a/Hurtworld/hwserver
+++ b/Hurtworld/hwserver
@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -69,6 +70,11 @@ githubbranch="master"
 # Steam
 appid="405100"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta devtest"
+branch=""
+
 # Server Details
 servicename="hurtworld-server"
 gamename="Hurtworld"
diff --git a/Insurgency/insserver b/Insurgency/insserver
index 90e17d7a4..3082d832a 100644
--- a/Insurgency/insserver
+++ b/Insurgency/insserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -57,6 +58,11 @@ githubbranch="master"
 # Steam
 appid="237410"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ins-server"
 gamename="Insurgency"
diff --git a/JustCause2/jc2server b/JustCause2/jc2server
index 021200d30..7ac9b3b3a 100644
--- a/JustCause2/jc2server
+++ b/JustCause2/jc2server
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -49,6 +50,11 @@ githubbranch="master"
 # Steam
 appid="261140"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta publicbeta"
+branch=""
+
 # Server Details
 servicename="jc2-server"
 gamename="Just Cause 2"
diff --git a/KillingFloor/kfserver b/KillingFloor/kfserver
index c621102ca..a9ba85c33 100644
--- a/KillingFloor/kfserver
+++ b/KillingFloor/kfserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -54,6 +55,11 @@ githubbranch="master"
 # Steam
 appid="215360"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="kf-server"
 gamename="Killing Floor"
diff --git a/LICENSE b/LICENSE
index 64aaf3c3f..24a57533c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Daniel Gibbs
+Copyright (c) 2016 Daniel Gibbs
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Left4Dead/l4dserver b/Left4Dead/l4dserver
index 1569730ef..9a2f8fb47 100644
--- a/Left4Dead/l4dserver
+++ b/Left4Dead/l4dserver
@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="222840"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="l4d-server"
 gamename="Left 4 Dead"
diff --git a/Left4Dead2/l4d2server b/Left4Dead2/l4d2server
index 4df0151d7..2dda75759 100644
--- a/Left4Dead2/l4d2server
+++ b/Left4Dead2/l4d2server
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -54,6 +55,11 @@ githubbranch="master"
 # Steam
 appid="222860"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="l4d2-server"
 gamename="Left 4 Dead 2"
diff --git a/Minecraft/mcserver b/Minecraft/mcserver
index e9bb190fe..71c5e207f 100644
--- a/Minecraft/mcserver
+++ b/Minecraft/mcserver
@@ -19,6 +19,7 @@ version="210816"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/Mumble/mumbleserver b/Mumble/mumbleserver
index ab071d7dc..ab9fdc22f 100644
--- a/Mumble/mumbleserver
+++ b/Mumble/mumbleserver
@@ -20,6 +20,7 @@ version="290716"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/NS2Combat/ns2cserver b/NS2Combat/ns2cserver
index e96e57cc0..4dbc1e276 100644
--- a/NS2Combat/ns2cserver
+++ b/NS2Combat/ns2cserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="220416"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="220416"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -62,6 +63,11 @@ githubbranch="master"
 # Steam
 appid="313900"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ns2c-server"
 gamename="NS2: Combat"
diff --git a/NaturalSelection2/ns2server b/NaturalSelection2/ns2server
index a84fba2e3..4a72f455d 100644
--- a/NaturalSelection2/ns2server
+++ b/NaturalSelection2/ns2server
@@ -19,6 +19,7 @@ version="220416"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/NoMoreRoomInHell/nmrihserver b/NoMoreRoomInHell/nmrihserver
index a8818a416..d1fea24f0 100644
--- a/NoMoreRoomInHell/nmrihserver
+++ b/NoMoreRoomInHell/nmrihserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="130716"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="130716"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -60,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="317670"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="nmrih-server"
 gamename="No More Room in Hell"
diff --git a/OpposingForce/opforserver b/OpposingForce/opforserver
index 7ddaef575..7faa17c66 100644
--- a/OpposingForce/opforserver
+++ b/OpposingForce/opforserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/PiratesVikingandKnightsII/pvkiiserver b/PiratesVikingandKnightsII/pvkiiserver
index 7b5c28b9a..def1a6c95 100644
--- a/PiratesVikingandKnightsII/pvkiiserver
+++ b/PiratesVikingandKnightsII/pvkiiserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -55,6 +56,11 @@ githubbranch="master"
 # Steam
 appid="17575"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="pvkii-server"
 gamename="Pirates, Vikings, and Knights II"
diff --git a/ProjectZomboid/pzserver b/ProjectZomboid/pzserver
index e3f4f2df6..8683d84e8 100644
--- a/ProjectZomboid/pzserver
+++ b/ProjectZomboid/pzserver
@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="290716"
+version="160916"
 
 #### Variables ####
 
@@ -20,6 +20,7 @@ version="290716"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -50,8 +51,10 @@ githubbranch="master"
 
 # Steam
 appid="380870"
-# Allows for opting into the various Steam branches that PZ has to offer
-# Example: -beta iwillbackupmysave -betapassword iaccepttheconsequences
+
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta iwillbackupmysave -betapassword iaccepttheconsequences"
 branch=""
 
 # Server Details
diff --git a/QuakeLive/qlserver b/QuakeLive/qlserver
index 9fc6ef5a4..72fdc32d8 100755
--- a/QuakeLive/qlserver
+++ b/QuakeLive/qlserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="060516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="060516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -43,7 +44,7 @@ updateonstart="off"
 # Install/Config Guide : https://steamcommunity.com/sharedfiles/filedetails/?id=542966946
 # Console Commands : http://www.regurge.at/ql/
 fn_parms(){
-	parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepath ${filesdir}/${port} +set zmq_rcon_enable 1 +set zmq_rcon_port ${rconport} +set zmq_rcon_password ${rconpassword} +set zmq_stats_enable 1 +set zmq_stats_password ${statspassword} +set zmq_stats_port ${statsport} +set sv_mapPoolFile ${mappool} +exec ${servercfg}"
+parms="+set net_strict 1 +set net_ip ${ip} +set net_port ${port} +set fs_homepath ${filesdir}/${port} +set zmq_rcon_enable 1 +set zmq_rcon_port ${rconport} +set zmq_rcon_password ${rconpassword} +set zmq_stats_enable 1 +set zmq_stats_password ${statspassword} +set zmq_stats_port ${statsport} +set sv_mapPoolFile ${mappool} +exec ${servercfg}"
 }
 
 #### Advanced Variables ####
@@ -58,6 +59,11 @@ githubbranch="master"
 # Steam
 appid="349090"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="ql-server"
 gamename="Quake Live"
diff --git a/RedOrchestra/roserver b/RedOrchestra/roserver
index d64c25994..0403a67a5 100644
--- a/RedOrchestra/roserver
+++ b/RedOrchestra/roserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/Ricochet/ricochetserver b/Ricochet/ricochetserver
index bab26ea44..d3a285691 100644
--- a/Ricochet/ricochetserver
+++ b/Ricochet/ricochetserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/Rust/rustserver b/Rust/rustserver
index 27cb6b03f..43a621596 100644
--- a/Rust/rustserver
+++ b/Rust/rustserver
@@ -10,7 +10,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -72,6 +73,11 @@ githubbranch="master"
 # Steam
 appid="258550"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta prerelease"
+branch=""
+
 # Server Details
 servicename="rust-server"
 gamename="Rust"
diff --git a/SeriousSam3BFE/ss3sserver b/SeriousSam3BFE/ss3sserver
index 38c70a30d..9d2420c60 100644
--- a/SeriousSam3BFE/ss3sserver
+++ b/SeriousSam3BFE/ss3sserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -50,6 +51,11 @@ githubbranch="master"
 # Steam
 appid="41080"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta publicbeta"
+branch=""
+
 # Server Details
 servicename="ss3-server"
 gamename="Serious Sam 3: BFE"
diff --git a/Starbound/sbserver b/Starbound/sbserver
index 87880fd2e..9af94eae6 100644
--- a/Starbound/sbserver
+++ b/Starbound/sbserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="230716"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="230716"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -49,6 +50,11 @@ githubbranch="master"
 # Steam
 appid="211820"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="sb-server"
 gamename="Starbound"
diff --git a/SvenCoop/svencoopserver b/SvenCoop/svencoopserver
index f59d3c81b..1ae1a341e 100644
--- a/SvenCoop/svencoopserver
+++ b/SvenCoop/svencoopserver
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -54,6 +55,11 @@ githubbranch="master"
 # Steam
 appid="276060"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta release_candidate_public"
+branch=""
+
 # Server Details
 servicename="svencoop-server"
 gamename="Sven Co-op"
diff --git a/TeamFortress2/tf2server b/TeamFortress2/tf2server
index 133c8ac6d..c9acadd43 100644
--- a/TeamFortress2/tf2server
+++ b/TeamFortress2/tf2server
@@ -9,7 +9,7 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="210516"
+version="160916"
 
 #### Variables ####
 
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
@@ -60,6 +61,11 @@ githubbranch="master"
 # Steam
 appid="232250"
 
+# Steam App Branch Select
+# Allows to opt into the various Steam app branches. Default branch is "".
+# Example: "-beta beta"
+branch=""
+
 # Server Details
 servicename="tf2-server"
 gamename="Team Fortress 2"
diff --git a/TeamFortressClassic/tfcserver b/TeamFortressClassic/tfcserver
index 78713c9a0..7dc68f971 100644
--- a/TeamFortressClassic/tfcserver
+++ b/TeamFortressClassic/tfcserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/TeamSpeak3/ts3server b/TeamSpeak3/ts3server
index dd36fb31f..88f187663 100644
--- a/TeamSpeak3/ts3server
+++ b/TeamSpeak3/ts3server
@@ -19,6 +19,7 @@ version="290716"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/Teeworlds/twserver b/Teeworlds/twserver
index 417eacae4..c8d920d59 100644
--- a/Teeworlds/twserver
+++ b/Teeworlds/twserver
@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/Terraria/terrariaserver b/Terraria/terrariaserver
index a4a4ef876..2cbef2d13 100644
--- a/Terraria/terrariaserver
+++ b/Terraria/terrariaserver
@@ -20,6 +20,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/UnrealTournament/utserver b/UnrealTournament/utserver
index 29bf40e0c..a5ff70a61 100644
--- a/UnrealTournament/utserver
+++ b/UnrealTournament/utserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/UnrealTournament2004/ut2k4server b/UnrealTournament2004/ut2k4server
index 15e1f1a06..f28240414 100644
--- a/UnrealTournament2004/ut2k4server
+++ b/UnrealTournament2004/ut2k4server
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/UnrealTournament3/ut3server b/UnrealTournament3/ut3server
index aeb2c7241..6af1c802e 100644
--- a/UnrealTournament3/ut3server
+++ b/UnrealTournament3/ut3server
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/UnrealTournament99/ut99server b/UnrealTournament99/ut99server
index 91e5e46fb..b40a41fdd 100644
--- a/UnrealTournament99/ut99server
+++ b/UnrealTournament99/ut99server
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/WolfensteinEnemyTerritory/wetserver b/WolfensteinEnemyTerritory/wetserver
index a3d5422eb..28f4c510b 100644
--- a/WolfensteinEnemyTerritory/wetserver
+++ b/WolfensteinEnemyTerritory/wetserver
@@ -19,6 +19,7 @@ version="210516"
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/lgsm/functions/alert_email.sh b/lgsm/functions/alert_email.sh
index 52529db6f..abca02525 100644
--- a/lgsm/functions/alert_email.sh
+++ b/lgsm/functions/alert_email.sh
@@ -230,7 +230,11 @@ fn_details_performance
 fn_details_disk
 fn_details_gameserver
 fn_alert_email_template_logs
-mail -s "${alertsubject}" "${email}" < "${emaillog}"
+if [ -n "${emailfrom}" ]; then
+	mail -s "${alertsubject}" -a "From: ${emailfrom}" "${email}" < "${emaillog}"
+else
+	mail -s "${alertsubject}" "${email}" < "${emaillog}"
+fi
 exitcode=$?
 if [ "${exitcode}" == "0" ]; then
 	fn_print_ok_nl "Sending alert: ${email}"
diff --git a/lgsm/functions/check.sh b/lgsm/functions/check.sh
index 58a3041d7..751652c2f 100644
--- a/lgsm/functions/check.sh
+++ b/lgsm/functions/check.sh
@@ -25,7 +25,7 @@ do
 	fi
 done
 
-local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh update_check.sh command_validate.sh command_update_functions.sh command_email_test.sh )
+local allowed_commands_array=( command_backup.sh command_console.sh command_debug.sh command_details.sh command_unreal2_maps.sh command_ut99_maps.sh command_monitor.sh command_start.sh command_stop.sh command_update.sh command_validate.sh command_update_functions.sh command_email_test.sh )
 for allowed_command in "${allowed_commands_array[@]}"
 do
 	if [ "${allowed_command}" == "${function_selfname}" ]; then
diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh
index 32e8d84e3..3b5e52005 100644
--- a/lgsm/functions/check_permissions.sh
+++ b/lgsm/functions/check_permissions.sh
@@ -43,8 +43,8 @@ fn_check_ownership(){
 
 		} | column -s $'\t' -t | tee -a "${scriptlog}"
 		echo ""
-		fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found"
-		fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-permissions-issues-found"
+		fn_print_information_nl "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-ownership-issues-found"
+		fn_script_log "For more information, please see https://github.com/GameServerManagers/LinuxGSM/wiki/FAQ#-fail--starting-game-server-ownership-issues-found"
 		core_exit.sh
 	fi
 }
diff --git a/lgsm/functions/core_getopt.sh b/lgsm/functions/core_getopt.sh
index 106dd6676..aed1890b2 100644
--- a/lgsm/functions/core_getopt.sh
+++ b/lgsm/functions/core_getopt.sh
@@ -130,7 +130,7 @@ case "${getopt}" in
 		echo -e "${blue}start\t${default}st |Start the server."
 		echo -e "${blue}stop\t${default}sp |Stop the server."
 		echo -e "${blue}restart\t${default}r  |Restart the server."
-		echo -e "${blue}update\t${default}u  |Checks and applies updates from SteamCMD."
+		echo -e "${blue}update\t${default}u  |Checks and applies updates from teamspeak.com."
 		echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded."
 		echo -e "${blue}monitor\t${default}m  |Checks that the server is running."
 		echo -e "${blue}test-alert\t${default}ta |Sends test alert."
@@ -257,7 +257,7 @@ case "${getopt}" in
 		echo -e "${blue}start\t${default}st |Start the server."
 		echo -e "${blue}stop\t${default}sp |Stop the server."
 		echo -e "${blue}restart\t${default}r  |Restart the server."
-		echo -e "${blue}update\t${default}u  |Checks and applies updates from SteamCMD."
+		echo -e "${blue}update\t${default}u  |Checks and applies updates from GitHub."
 		echo -e "${blue}update-functions\t${default}uf |Removes all functions so latest can be downloaded."
 		echo -e "${blue}monitor\t${default}m  |Checks that the server is running."
 		echo -e "${blue}test-alert\t${default}ta |Sends test alert."
@@ -281,7 +281,7 @@ case "${getopt}" in
 		command_update.sh;;
 	fu|force-update|update-restart)
 		forceupdate=1;
-		update_check.sh;;
+		command_update.sh;;
 	uf|update-functions)
 		command_update_functions.sh;;
 	v|validate)
@@ -422,7 +422,7 @@ case "${getopt}" in
 		command_update.sh;;
 	fu|force-update|update-restart)
 		forceupdate=1;
-		update_check.sh;;
+		command_update.sh;;
 	uf|update-functions)
 		command_update_functions.sh;;
 	v|validate)
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index f2157e54a..bc7516427 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -19,6 +19,7 @@ fi
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index d62cf4e76..3189ec872 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -19,6 +19,7 @@ fi
 # Email
 emailalert="off"
 email="email@example.com"
+#emailfrom="email@example.com"
 
 # Pushbullet
 # https://www.pushbullet.com/#settings