Index: src/libcfa/containers/maybe
===================================================================
--- src/libcfa/containers/maybe	(revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2)
+++ src/libcfa/containers/maybe	(revision 20877d2eef6ecadc8e9da4a79b2995277fb25362)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 24 14:43:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 25 16:36:00 2017
-// Update Count     : 1
+// Last Modified On : Fri Jun 16 15:42:00 2017
+// Update Count     : 2
 //
 
@@ -46,4 +46,5 @@
 bool ?!=?(maybe(T) this, zero_t);
 
+/* Waiting for bug#11 to be fixed.
 forall(otype T)
 maybe(T) maybe_value(T value);
@@ -51,4 +52,5 @@
 forall(otype T)
 maybe(T) maybe_none();
+*/
 
 forall(otype T)
Index: src/libcfa/containers/result
===================================================================
--- src/libcfa/containers/result	(revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2)
+++ src/libcfa/containers/result	(revision 20877d2eef6ecadc8e9da4a79b2995277fb25362)
@@ -10,6 +10,6 @@
 // Created On       : Wed May 24 14:45:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 25 16:39:00 2017
-// Update Count     : 1
+// Last Modified On : Fri Jun 16 15:41:00 2017
+// Update Count     : 2
 //
 
@@ -55,4 +55,5 @@
 bool ?!=?(result(T, E) this, zero_t);
 
+/* Wating for bug#11 to be fixed.
 forall(otype T, otype E)
 result(T, E) result_value(T value);
@@ -60,4 +61,5 @@
 forall(otype T, otype E)
 result(T, E) result_error(E error);
+*/
 
 forall(otype T, otype E)
Index: src/libcfa/containers/result.c
===================================================================
--- src/libcfa/containers/result.c	(revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2)
+++ src/libcfa/containers/result.c	(revision 20877d2eef6ecadc8e9da4a79b2995277fb25362)
@@ -74,5 +74,5 @@
 forall(otype T, otype E)
 bool ?!=?(result(T, E) this, zero_t) {
-	return !this.has_value;
+	return this.has_value;
 }
 
@@ -100,5 +100,5 @@
 forall(otype T, otype E)
 E get_error(result(T, E) * this) {
-	assertf(this->has_value, "attempt to get from result without error");
+	assertf(!this->has_value, "attempt to get from result without error");
 	return this->error;
 }