diff --git a/POCmdlineHelperClasses.cpp b/POCmdlineHelperClasses.cpp
index 81dff74..f5fcf32 100644
--- a/POCmdlineHelperClasses.cpp
+++ b/POCmdlineHelperClasses.cpp
@@ -8,9 +8,9 @@
 namespace po = boost::program_options;
 
 
-void po_cmdline_helper::init(boost::program_options::options_description cmdline_desc){
+void po_cmdline_helper::init(boost::program_options::options_description *cmdline_desc){
 
-        cmdline_desc.add_options()  ("help", "produce help message")
+        cmdline_desc->add_options()  ("help", "produce help message")
                                     ("version,v", "print the version number")
                                     ("hostname,h", po::value<std::string>()->default_value("localhost"), "Hostname")
                                     ("port,p", po::value<int>()->default_value(1883), "Port")
diff --git a/POCmdlineHelperClasses.hpp b/POCmdlineHelperClasses.hpp
index 1257692..8b0e351 100644
--- a/POCmdlineHelperClasses.hpp
+++ b/POCmdlineHelperClasses.hpp
@@ -8,7 +8,7 @@
 class po_cmdline_helper {
 
 public:
-    void init(boost::program_options::options_description cmdline_desc);
+    void init(boost::program_options::options_description *cmdline_desc);
 
 };
 
diff --git a/main.cpp b/main.cpp
index 65942c5..1401101 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "POHelperClasses.hpp"
+#include "POCmdlineHelperClasses.hpp"
 #include "MQTTDataStreamer.hpp"
 
 #include <boost/program_options.hpp>
@@ -186,6 +187,8 @@ int main(int argc, char *argv[])
 
     std::string hostname;
 
+    po_cmdline_helper po_cmdline_inst;
+
     boost::program_options::options_description desc_env;
     desc_env.add_options() ("path", "the execution path")
                            ("home", "the home directory of the executing user")
@@ -217,6 +220,9 @@ int main(int argc, char *argv[])
 
     // set options allowed by the command line
     po::options_description command_line_options("Allowed options");
+
+    po_cmdline_inst.init( &command_line_options );
+    /*
     command_line_options.add_options()  ("help", "produce help message")
                                         ("version,v", "print the version number")
                                         ("hostname,h", po::value<string>()->default_value("localhost"), "Hostname")
@@ -227,6 +233,8 @@ int main(int argc, char *argv[])
                                         ("deveui", po::value<deveui>(), "DEVEUI")
 					                    ("devkey", po::value<devkey>(), "DEVKEY");
 
+    */
+
     // set options allowed in config file
     po::options_description config_file_options;
     config_file_options.add_options() ("APPEUI", po::value<appeui>(), "APPEUI")