Index: Makefile
===================================================================
--- Makefile	(revision 914f348b84b14a1b3bc5380280b6e824a5b70fde)
+++ Makefile	(revision dfd01819d81bf2875d16b73f8dbb0f84014319d3)
@@ -1,4 +1,5 @@
 CC=g++
 CFLAGS = -g -DLINUX
+CXXFLAGS = -g -std=c++11
 # uncomment this for SunOS
 # LIBS = -lsocket -lnsl
@@ -6,9 +7,9 @@
 all: netslow
 
-netslow: netslow.o NetFlow9Processor.o NetFlowDataTemplateCache.o NetFlowDataTemplate.o FlowSet.o FlowSetRecord.o Config.o
-	$(CC) -o netslow netslow.o NetFlow9Processor.o NetFlowDataTemplateCache.o NetFlowDataTemplate.o FlowSet.o FlowSetRecord.o Config.o $(LIBS)
+netslow: netslow.o NetFlow9Processor.o NetFlowDataTemplateCache.o NetFlowDataTemplate.o FlowSet.o FlowSetRecord.o Config.o Log.o
+	$(CC) -o netslow netslow.o NetFlow9Processor.o NetFlowDataTemplateCache.o NetFlowDataTemplate.o FlowSet.o FlowSetRecord.o Config.o Log.o $(LIBS)
 
 
-netslow.o: netslow.cpp port.h
+netslow.o: netslow.cpp
 NetFlow9Processor.o: NetFlow9Processor.cpp
 NetFlowDataTemplateCache.o: NetFlowDataTemplateCache.cpp
@@ -17,4 +18,5 @@
 FlowSetRecord.o: FlowSetRecord.cpp
 Config.o: Config.cpp
+Log.o: Log.cpp
 
 clean:
Index: NetFlow9Processor.cpp
===================================================================
--- NetFlow9Processor.cpp	(revision 914f348b84b14a1b3bc5380280b6e824a5b70fde)
+++ NetFlow9Processor.cpp	(revision dfd01819d81bf2875d16b73f8dbb0f84014319d3)
@@ -112,5 +112,5 @@
 	NetFlowDataTemplate *dataTemplate;          // Data Template object
 	NetFlowDataTemplate::Field_t field;
-	FlowSet *Flowset = new FlowSet(strRemoteIP);
+	FlowSet *Flowset;
 	int recordsExpected = 0;
 	int dataTemplateRecordLength = 0;
@@ -134,5 +134,7 @@
 
 		printf("  -> FS Length %d, FSR Length: %d, FSRs expected: %d, recalculated length: %d\n", dataTemplateRecordLength, flowSetLength, recordsExpected, lengthOfAllRecords);
-	
+		
+		Flowset = new FlowSet(strRemoteIP)
+
 		for (count = 0; count < recordsExpected; count++) {
 		
Index: netslow.cpp
===================================================================
--- netslow.cpp	(revision 914f348b84b14a1b3bc5380280b6e824a5b70fde)
+++ netslow.cpp	(revision dfd01819d81bf2875d16b73f8dbb0f84014319d3)
@@ -71,5 +71,5 @@
 
 			if (remotePacketAddress.sin_family != AF_INET || remotePacketAddress.sin_addr.s_addr != remoteAddress.sin_addr.s_addr) {
-				continue; //Ooops something wrong with this packet
+				continue; //Ooops something wrong with this packet or it's not from the correct router
 			}
 
@@ -92,4 +92,5 @@
 						for (int i = 0; i < processedFlowSet->GetRecord(0)->GetRecord(6).length; i++) { printf("%02X", processedFlowSet->GetRecord(0)->GetRecord(6).data[i]); }
 						printf("\n");
+						delete processedFlowSet;
 					}
 					break;