diff --git a/bacnet-stack/demo/dcc/main.c b/bacnet-stack/demo/dcc/main.c
index eeb03ea1..fa925452 100644
--- a/bacnet-stack/demo/dcc/main.c
+++ b/bacnet-stack/demo/dcc/main.c
@@ -162,7 +162,8 @@ int main(int argc, char *argv[])
             "  1=disable\r\n"
             "  2=disable-initiation\r\n"
             "The timeout can be 0 for infinite, or a value in minutes for disable.\r\n"
-            "The optional password is a character string of 1 to 20 characters.\r\n",
+            "The optional password is a character string of 1 to 20 characters.\r\n"
+            "Use BACNET_IFACE environment variable for the interface\r\n",
             filename_remove_path(argv[0]), BACNET_MAX_INSTANCE - 1);
         return 0;
     }
@@ -184,7 +185,7 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/epics/main.c b/bacnet-stack/demo/epics/main.c
index 4b6796bb..54a9dd41 100644
--- a/bacnet-stack/demo/epics/main.c
+++ b/bacnet-stack/demo/epics/main.c
@@ -277,7 +277,8 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    datalink_init(Network_Interface);
+    if (!datalink_init(getenv("BACNET_IFACE")))
+        return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
     timeout_seconds = (Device_APDU_Timeout() / 1000) *
diff --git a/bacnet-stack/demo/readfile/main.c b/bacnet-stack/demo/readfile/main.c
index 1315485a..f7b6ece3 100644
--- a/bacnet-stack/demo/readfile/main.c
+++ b/bacnet-stack/demo/readfile/main.c
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/readprop/main.c b/bacnet-stack/demo/readprop/main.c
index d44f4fe4..90c9856c 100644
--- a/bacnet-stack/demo/readprop/main.c
+++ b/bacnet-stack/demo/readprop/main.c
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/reinit/main.c b/bacnet-stack/demo/reinit/main.c
index b0661ecb..6dd9d7bb 100644
--- a/bacnet-stack/demo/reinit/main.c
+++ b/bacnet-stack/demo/reinit/main.c
@@ -181,7 +181,7 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/timesync/main.c b/bacnet-stack/demo/timesync/main.c
index 03548a1a..07737b9d 100644
--- a/bacnet-stack/demo/timesync/main.c
+++ b/bacnet-stack/demo/timesync/main.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
     /* setup my info */
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/ucov/main.c b/bacnet-stack/demo/ucov/main.c
index 1d4b399e..d2cf4365 100644
--- a/bacnet-stack/demo/ucov/main.c
+++ b/bacnet-stack/demo/ucov/main.c
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
     /* setup my info */
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* only one value in our value list */
     cov_data.listOfValues.next = NULL;
diff --git a/bacnet-stack/demo/whohas/main.c b/bacnet-stack/demo/whohas/main.c
index c10e4ee8..95cfed99 100644
--- a/bacnet-stack/demo/whohas/main.c
+++ b/bacnet-stack/demo/whohas/main.c
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
     /* setup my info */
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/whois/main.c b/bacnet-stack/demo/whois/main.c
index 612a302e..fe1f004f 100644
--- a/bacnet-stack/demo/whois/main.c
+++ b/bacnet-stack/demo/whois/main.c
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
     /* setup my info */
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/writefile/main.c b/bacnet-stack/demo/writefile/main.c
index 8fa936a6..0c63ddfb 100644
--- a/bacnet-stack/demo/writefile/main.c
+++ b/bacnet-stack/demo/writefile/main.c
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/demo/writeprop/main.c b/bacnet-stack/demo/writeprop/main.c
index 195ea8db..00a9a25e 100644
--- a/bacnet-stack/demo/writeprop/main.c
+++ b/bacnet-stack/demo/writeprop/main.c
@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
     Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE);
     address_init();
     Init_Service_Handlers();
-    if (!datalink_init(NULL))
+    if (!datalink_init(getenv("BACNET_IFACE")))
         return 1;
     /* configure the timeout values */
     last_seconds = time(NULL);
diff --git a/bacnet-stack/version.h b/bacnet-stack/version.h
index e880a2de..eade430c 100644
--- a/bacnet-stack/version.h
+++ b/bacnet-stack/version.h
@@ -39,8 +39,8 @@
 #define BACNET_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
 #endif
 
-#define BACNET_VERSION_TEXT "1.0.0"
-#define BACNET_VERSION_CODE BACNET_VERSION(1,0,0)
+#define BACNET_VERSION_TEXT "0.3.6"
+#define BACNET_VERSION_CODE BACNET_VERSION(0,3,6)
 #define BACNET_VERSION_MAJOR ((BACNET_VERSION_CODE>>16)&0xFF)
 #define BACNET_VERSION_MINOR ((BACNET_VERSION_CODE>>8)&0xFF)
 #define BACNET_VERSION_MAINTENANCE (BACNET_VERSION_CODE&0xFF)