diff --git a/.bzrignore b/.bzrignore
index dc2d51ed087708f7132bf2ac1ddc3cb7a8b97d02..2653f98bf8a5f7eeb57a4da1a6cb6b376ebfc9da 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -31,3 +31,4 @@ examples/simple/example_decoder
 examples/simple/example_encoder
 lib/c/test/test_labcomm_basic_type_encoding
 lib/c/test/test_labcomm_generated_encoding
+lib/java/se/lth/control/labcomm/WriterWrapper.class
diff --git a/examples/Makefile b/examples/Makefile
index f9a55111448869ff4ca79977404878d3017515ed..c9531e84e1a2d6effa96f25960a59186b4ba57c6 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,6 +1,6 @@
 all:
 	echo To be done...
-
+	$(MAKE) -C twoway e 	
 test:
 	echo More to be done...
 	cd simple ; sh compile.sh && sh run.sh
diff --git a/lib/c/labcomm_error.h b/lib/c/labcomm_error.h
new file mode 100644
index 0000000000000000000000000000000000000000..79f4647f810f74f862e82781e7a9f41d6bc974e0
--- /dev/null
+++ b/lib/c/labcomm_error.h
@@ -0,0 +1,31 @@
+#ifndef __LABCOMM_ERROR_H__
+#define __LABCOMM_ERROR_H__
+
+enum labcomm_error {
+#define LABCOMM_ERROR(name, description) name ,
+#include "labcomm_error.h"
+#undef LABCOMM_ERROR
+};
+
+#endif
+
+#ifdef LABCOMM_ERROR
+
+LABCOMM_ERROR(LABCOMM_ERROR_ENC_NO_REG_SIGNATURE, 
+	      "Encoder has no registration for this signature")
+LABCOMM_ERROR(LABCOMM_ERROR_ENC_BUF_FULL,
+	      "The labcomm buffer is full")
+LABCOMM_ERROR(LABCOMM_ERROR_DEC_UNKNOWN_DATATYPE,
+	      "Decoder: Unknown datatype")
+LABCOMM_ERROR(LABCOMM_ERROR_DEC_INDEX_MISMATCH, 
+	      "Decoder: index mismatch")
+LABCOMM_ERROR(LABCOMM_ERROR_DEC_TYPE_NOT_FOUND,
+	      "Decoder: type not found")
+LABCOMM_ERROR(LABCOMM_ERROR_UNIMPLEMENTED_FUNC,
+	      "This function is not yet implemented")
+LABCOMM_ERROR(LABCOMM_ERROR_MEMORY,
+	      "Could not allocate memory")
+LABCOMM_ERROR(LABCOMM_ERROR_USER_DEF,     
+	      "User defined error")
+
+#endif