diff --git a/Makefile b/Makefile
index 53c4c73c0cfe0469f55b53c8ac6a931991554b54..41a583f0052fa828618cbe0f24d1cd7cdaaba28c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,19 @@ DEPENDS = src/librf625.cpp \
 	  src/librf625.h \
 	  src/sockfun.cpp
 
-lib: ${DEPENDS}
-	${CC} -shared ${CXX_FLAGS} -o librf625.so src/librf625.cpp src/sockfun.cpp
+librf625.so: $(DEPENDS)
+	$(CC) -shared $(CXX_FLAGS) -o $@ src/librf625.cpp src/sockfun.cpp
+
 
 test: ${DEPENDS}
-	${CC} -DTEST ${CXX_FLAGS} -o test src/librf625.cpp src/sockfun.cpp
+	$(CC) -DTEST $(CXX_FLAGS) -o $@ src/librf625.cpp src/sockfun.cpp
+
+sample: librf625.so samples/udp_stream.cpp src/librf625.h
+	g++ samples/udp_stream.cpp -I ./src -L. -lrf625 -o $@ -lcurses
 
 clean:
-	rm *.so test
+	rm *.so test sample
 
-all: lib test
+all: librf625.so test sample
 
-.PHONY : lib test clean all
+.PHONY : librf625.so test clean all sample
diff --git a/samples/udp_stream.cpp b/samples/udp_stream.cpp
index 42be7799a8082408485a8daeb3404e29e1d9ca2d..51e6a2864a5e4c86aa018a21c423f4f3b249607e 100644
--- a/samples/udp_stream.cpp
+++ b/samples/udp_stream.cpp
@@ -1,10 +1,17 @@
-#include <conio.h>
 #include <iostream>
 #include <fstream>
 #include <map>
 #include <string>
 #include "librf625.h"
 
+
+#ifdef __linux__
+#include <arpa/inet.h>
+#include <curses.h>
+#else
+#include <conio.h>
+#endif
+
 std::map<int,std::ofstream*> dump_files;
 
 void udp_proc(rf625_profile prf)