diff --git a/libnymea-gpio/gpiomonitor.cpp b/libnymea-gpio/gpiomonitor.cpp
index 7e66708..22d4975 100644
--- a/libnymea-gpio/gpiomonitor.cpp
+++ b/libnymea-gpio/gpiomonitor.cpp
@@ -2,8 +2,9 @@
 
 #include <QMutexLocker>
 
-GpioMonitor::GpioMonitor(int gpio, QObject *parent) :
-    QThread(parent)
+GpioMonitor::GpioMonitor(int gpio, Gpio::Edge edge, QObject *parent) :
+    QThread(parent),
+    m_edge(edge)
 {
     m_gpio = new Gpio(gpio, this);
     connect(this, &GpioMonitor::started, this, &GpioMonitor::onThreadStarted);
@@ -97,8 +98,8 @@ bool GpioMonitor::enable()
         return false;
     }
 
-    if (!m_gpio->setEdgeInterrupt(Gpio::EdgeBoth)) {
-        qCWarning(dcGpio()) << "Could not enable GPIO monitor.";
+    if (!m_gpio->setEdgeInterrupt(m_edge)) {
+        qCWarning(dcGpio()) << "Could not set interrupt for the GPIO monitor.";
         return false;
     }
 
diff --git a/libnymea-gpio/gpiomonitor.h b/libnymea-gpio/gpiomonitor.h
index da234f3..1cc4a59 100644
--- a/libnymea-gpio/gpiomonitor.h
+++ b/libnymea-gpio/gpiomonitor.h
@@ -11,7 +11,7 @@ class GpioMonitor : public QThread
 {
     Q_OBJECT
 public:
-    explicit GpioMonitor(int gpio, QObject *parent = nullptr);
+    explicit GpioMonitor(int gpio, Gpio::Edge edge = Gpio::EdgeBoth, QObject *parent = nullptr);
     ~GpioMonitor() override;
 
     Gpio::Value value();
@@ -19,6 +19,7 @@ public:
 
 private:
     Gpio *m_gpio = nullptr;
+    Gpio::Edge m_edge = Gpio::EdgeBoth;
     bool m_enabled = false;
 
     // Thread stuff
diff --git a/nymea-gpio-tool/main.cpp b/nymea-gpio-tool/main.cpp
index 99aff39..85f7ec0 100644
--- a/nymea-gpio-tool/main.cpp
+++ b/nymea-gpio-tool/main.cpp
@@ -1,6 +1,8 @@
 #include <QCoreApplication>
 #include <QCommandLineParser>
 
+#include "gpiomonitor.h"
+
 int main(int argc, char *argv[])
 {
     QCoreApplication application(argc, argv);
@@ -10,12 +12,137 @@ int main(int argc, char *argv[])
 
     QCommandLineParser parser;
     parser.addHelpOption();
+    parser.addVersionOption();
     QString applicationDescription = QString("\nnymea-gpio-tool is a command line tool which allowes to interact with GPIOs.\n"
                                              "Version: %1\n"
-                                             "Copyright %2 2019 Simon Stürz <simon.stuerz@nymea.io>\n"
-                                             "Released under the GNU GENERAL PUBLIC LICENSE Version 3.").arg(application.applicationVersion()).arg(QChar(0xA9));
+                                             "Copyright %2 2019 Simon Stürz <simon.stuerz@nymea.io>\n\n"
+                                             "Released under the GNU GENERAL PUBLIC LICENSE Version 3.\n").arg(application.applicationVersion()).arg(QChar(0xA9));
     parser.setApplicationDescription(applicationDescription);
+
+    QCommandLineOption gpioOption(QStringList() << "g" << "gpio", "The gpio number to use.", "GPIO");
+    parser.addOption(gpioOption);
+
+    QCommandLineOption interruptOption(QStringList() << "i" << "interrupt", "Configure the input GPIO to the given interrupt. This option is only allowed for monitoring. Allowerd interrupts are: [rising, falling, both, none]. Default is \"both\".", "INTERRUPT");
+    parser.addOption(interruptOption);
+
+    QCommandLineOption valueOption(QStringList() << "s" << "set-value", "Configure the GPIO to output and set the value. Allowerd values are: [0, 1].", "VALUE");
+    parser.addOption(valueOption);
+
+    QCommandLineOption monitorOption(QStringList() << "m" << "monitor", "Monitor the given gpio. The GPIO wil automatically configured as input and print any change regarding to the given interrupt behaviour.");
+    parser.addOption(monitorOption);
+
+    QCommandLineOption activeLowOption(QStringList() << "a" << "active-low", "Set the GPIO to active low. Allowerd values are: [0, 1]", "VALUE");
+    parser.addOption(activeLowOption);
+
     parser.process(application);
 
+    // Make sure there is a GPIO number passed
+    if (!parser.isSet(gpioOption)) {
+        qCritical() << "No GPIO number specified. Please specify a valid GPIO number using -g, --gpio GPIO";
+        parser.showHelp(1);
+    }
+
+    // Verify GPIO number
+    bool gpioNumberOk;
+    int gpioNumber = parser.value(gpioOption).toInt(&gpioNumberOk);
+    if (!gpioNumberOk || gpioNumber < 0) {
+        qCritical() << "Invalid GPIO number" << parser.value(gpioOption) << "passed. The GPIO number has to be a positiv integer.";
+        application.exit(1);
+    }
+
+    // Verify input output operations
+    if ((parser.isSet(interruptOption) || parser.isSet(monitorOption)) && parser.isSet(valueOption)) {
+        qCritical() << "Invalid parameter combination. The set value can only be used for output GPIO, the monitor and interrupt parameter can only be used for input GPIO.";
+        application.exit(1);
+    }
+
+    Gpio::Edge edge = Gpio::EdgeBoth;
+    if (parser.isSet(interruptOption)) {
+        if (parser.value(interruptOption).toLower() == "rising") {
+            edge = Gpio::EdgeRising;
+        } else if (parser.value(interruptOption).toLower() == "falling") {
+            edge = Gpio::EdgeFalling;
+        } else if (parser.value(interruptOption).toLower() == "none") {
+            edge = Gpio::EdgeNone;
+        } else if (parser.value(interruptOption).toLower() == "both") {
+            edge = Gpio::EdgeBoth;
+        } else {
+            qCritical() << "Invalid interrupt parameter" << parser.value(interruptOption) << "passed. Valid options are [rising, falling, both, none].";
+            application.exit(1);
+        }
+    }
+
+    bool activeLow = false;
+    if (parser.isSet(activeLowOption)) {
+        if (parser.value(activeLowOption) == "1") {
+            activeLow = true;
+        } else if (parser.value(activeLowOption) == "0") {
+            activeLow = false;
+        } else {
+            qCritical() << "Invalid active low parameter" << parser.value(activeLowOption) << "passed. Valid options are [0, 1].";
+            application.exit(1);
+        }
+    }
+
+    Gpio::Value value = Gpio::ValueInvalid;
+    if (parser.isSet(valueOption)) {
+        if (parser.value(valueOption) == "1") {
+            value = Gpio::ValueHigh;
+        } else if (parser.value(valueOption) == "0") {
+            value = Gpio::ValueLow;
+        } else {
+            qCritical() << "Invalid set value parameter" << parser.value(valueOption) << "passed. Valid options are [0, 1].";
+            application.exit(1);
+        }
+    }
+
+    if (!Gpio::isAvailable()) {
+        qCritical() << "There are no GPIOs available on this platform.";
+        application.exit(2);
+    }
+
+    // Configure the GPIO
+    if (parser.isSet(valueOption)) {
+        Gpio *gpio = new Gpio(gpioNumber);
+        if (!gpio->exportGpio()) {
+            qCritical() << "Could not export GPIO" << gpioNumber;
+            exit(1);
+        }
+
+        if (!gpio->setDirection(Gpio::DirectionOutput)) {
+            qCritical() << "Could not configure GPIO" << gpioNumber << "as output.";
+            exit(1);
+        }
+
+        if (parser.isSet(activeLowOption)) {
+            if (!gpio->setActiveLow(activeLow)) {
+                qCritical() << "Could not set GPIO" << gpioNumber << "to active low" << activeLow;
+                exit(1);
+            }
+        }
+
+        // Finally set the value
+        if (!gpio->setValue(value)) {
+            qCritical() << "Could not set GPIO" << gpioNumber << "value to" << value;
+            exit(1);
+        }
+
+        application.exit();
+    } else {
+        GpioMonitor *monitor = new GpioMonitor(gpioNumber, edge);
+        QObject::connect(monitor, &GpioMonitor::enabledChanged, [gpioNumber](bool enabled) {
+            qDebug() << "GPIO" << gpioNumber << "monitor" << (enabled ? "enabled" : "disabled");
+        });
+
+        QObject::connect(monitor, &GpioMonitor::valueChanged, [gpioNumber](bool value) {
+            qDebug() << "GPIO" << gpioNumber << "value changed" << (value ? "1" : "0");
+        });
+
+        if (!monitor->enable()) {
+            qCritical() << "Could not enable GPIO" << gpioNumber << "monitor.";
+            exit(1);
+        }
+    }
+
     return application.exec();
 }
diff --git a/nymea-gpio-tool/nymea-gpio-tool.pro b/nymea-gpio-tool/nymea-gpio-tool.pro
index 302ae7f..880ba19 100644
--- a/nymea-gpio-tool/nymea-gpio-tool.pro
+++ b/nymea-gpio-tool/nymea-gpio-tool.pro
@@ -13,3 +13,5 @@ SOURCES += main.cpp \
 
 target.path = /usr/bin
 INSTALLS += target
+
+HEADERS +=