diff --git a/.gitmodules b/.gitmodules
index edc8155..9dff86e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "nagios"]
 	path = nagios.src
 	url = https://git.mount-mockery.de/pylib/nagios.git
+[submodule "pyrip"]
+	path = pyrip
+	url = https://git.mount-mockery.de/application/pyrip.git
+[submodule "pyrip.src"]
+	path = pyrip.src
+	url = https://git.mount-mockery.de/application/pyrip.git
diff --git a/gitconfig b/gitconfig
index e0bed2e..3d7b83a 100755
--- a/gitconfig
+++ b/gitconfig
@@ -3,7 +3,12 @@
 git config --global user.name "Dirk Alders"
 git config --global user.email dirk@mount-mockery.de
 #
+git config --global pull.rebase false
+#
 git config --global diff.tool meld
 git config --global merge.tool meld
+git config --global merge.tool.cmd 'meld --auto-merge "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"'
 git config --global --add difftool.prompt false
-git config --global pull.rebase false
+#
+git config --global config credential.helper store
+
diff --git a/mqtt_sniffer b/mqtt_sniffer
new file mode 100755
index 0000000..0d23514
--- /dev/null
+++ b/mqtt_sniffer
@@ -0,0 +1,4 @@
+#!/bin/bash
+#
+/opt/mqtt_sniffer/venv/bin/python /opt/mqtt_sniffer/mqtt_sniffer.py $*
+
diff --git a/mqtt_test_smarthome b/mqtt_test_smarthome
new file mode 100755
index 0000000..0c30de5
--- /dev/null
+++ b/mqtt_test_smarthome
@@ -0,0 +1,16 @@
+#!/bin/sh
+clear
+
+#!/bin/sh
+#
+
+for s in $(tmux list-sessions -F '#{session_name}'); do
+    p=$(tmux list-panes -F '#{pane_tty}' -t "$s")
+    if [ "$p" = "$(tty)" ]; then
+        # Session already running
+        exit 0
+    fi
+done
+
+tmux attach-session -t mqtt_test_smarthome || tmux new-session -s mqtt_test_smarthome "/opt/mqtt_sniffer/venv/bin/python /opt/mqtt_sniffer/mqtt_sniffer.py -f mqtt.home -p 1884 -n"
+
diff --git a/nas_halt b/nas_halt
new file mode 100755
index 0000000..42db789
--- /dev/null
+++ b/nas_halt
@@ -0,0 +1,3 @@
+#!/bin/bash
+#
+ssh nas sudo /usr/sbin/shutdown -P 5
diff --git a/nas_wake b/nas_wake
new file mode 100755
index 0000000..b6a8fa8
--- /dev/null
+++ b/nas_wake
@@ -0,0 +1,4 @@
+#!/bin/sh
+#
+wakeonlan 38:ea:a7:a6:03:9d
+
diff --git a/pyrip b/pyrip
new file mode 100755
index 0000000..69cc7ae
--- /dev/null
+++ b/pyrip
@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+BASEDIR=$(dirname $0)
+
+$BASEDIR/pyrip.src/venv/bin/python $BASEDIR/pyrip.src/pyrip.py $*
+
diff --git a/pyrip.src b/pyrip.src
new file mode 160000
index 0000000..48dc481
--- /dev/null
+++ b/pyrip.src
@@ -0,0 +1 @@
+Subproject commit 48dc481f268e1ecdcd8d5e0126df553781e40a78