diff --git a/hardware/PiGpio/36-rpi-gpio.js b/hardware/PiGpio/36-rpi-gpio.js
index e2b3ad85..d93a8a40 100644
--- a/hardware/PiGpio/36-rpi-gpio.js
+++ b/hardware/PiGpio/36-rpi-gpio.js
@@ -5,7 +5,7 @@ module.exports = function(RED) {
     var exec = require('child_process').exec;
     var spawn = require('child_process').spawn;
 
-    var testCommand = __dirname+'/testgpio.py'
+    var testCommand = __dirname+'/testgpio'
     var gpioCommand = __dirname+'/nrgpio';
     var allOK = true;
 
@@ -225,7 +225,7 @@ module.exports = function(RED) {
         var node = this;
 
         if (allOK === true) {
-            node.child = spawn(gpioCommand+".py", ["mouse",node.butt]);
+            node.child = spawn(gpioCommand, ["mouse",node.butt]);
             node.status({fill:"green",shape:"dot",text:"rpi-gpio.status.ok"});
 
             node.child.stdout.on('data', function (data) {
@@ -276,7 +276,7 @@ module.exports = function(RED) {
         var node = this;
 
         var doConnect = function() {
-            node.child = spawn(gpioCommand+".py", ["kbd","0"]);
+            node.child = spawn(gpioCommand, ["kbd","0"]);
             node.status({fill:"green",shape:"dot",text:"rpi-gpio.status.ok"});
 
             node.child.stdout.on('data', function (data) {
diff --git a/hardware/PiGpio/nrgpio b/hardware/PiGpio/nrgpio
index efbaacbd..86b10e83 100755
--- a/hardware/PiGpio/nrgpio
+++ b/hardware/PiGpio/nrgpio
@@ -1,17 +1,4 @@
 #!/bin/bash
-#
-# Copyright JS Foundation and other contributors, http://js.foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 python_cmd='python3'
 # Fallback to Python 2, if Python 3 is not available
diff --git a/hardware/PiGpio/nrgpio.py b/hardware/PiGpio/nrgpio.py
index 3987296b..4b5b9875 100755
--- a/hardware/PiGpio/nrgpio.py
+++ b/hardware/PiGpio/nrgpio.py
@@ -1,17 +1,3 @@
-#!/usr/bin/python
-#
-# Copyright JS Foundation and other contributors, http://js.foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 # Import library functions we need
 import RPi.GPIO as GPIO
diff --git a/hardware/PiGpio/package.json b/hardware/PiGpio/package.json
index 5ccba479..64dcc05a 100644
--- a/hardware/PiGpio/package.json
+++ b/hardware/PiGpio/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-pi-gpio",
-  "version": "2.0.0-beta3",
+  "version": "2.0.0-beta4",
   "description": "The basic Node-RED node for Pi GPIO",
   "dependencies"  : {
   },
diff --git a/hardware/PiGpio/testgpio b/hardware/PiGpio/testgpio
new file mode 100755
index 00000000..396e8449
--- /dev/null
+++ b/hardware/PiGpio/testgpio
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+python_cmd='python3'
+# Fallback to Python 2, if Python 3 is not available
+command -v python3 > /dev/null || python_cmd=`python`
+
+BASEDIR=$(dirname $0)
+$python_cmd -u $BASEDIR/testgpio.py $@
diff --git a/hardware/PiGpio/testgpio.py b/hardware/PiGpio/testgpio.py
index 57305fd2..f474faa2 100755
--- a/hardware/PiGpio/testgpio.py
+++ b/hardware/PiGpio/testgpio.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
 import sys
 try:
     import RPi.GPIO as GPIO