diff --git a/hamcrest/src/main/java/org/hamcrest/optional/OptionalEmpty.java b/hamcrest/src/main/java/org/hamcrest/optional/OptionalEmpty.java
index 97592fe3..eafef28a 100644
--- a/hamcrest/src/main/java/org/hamcrest/optional/OptionalEmpty.java
+++ b/hamcrest/src/main/java/org/hamcrest/optional/OptionalEmpty.java
@@ -7,12 +7,18 @@
 import java.util.Optional;
 
 /**
- * Matcher that expects empty {@link Optional}.
+ * Matcher that expects an empty {@link Optional}.
 
  * @param <T> type of {@link Optional} value
  */
 public class OptionalEmpty<T> extends TypeSafeDiagnosingMatcher<Optional<T>> {
 
+    /**
+     * Constructor, best called from {@link #emptyOptional()}.
+     */
+    public OptionalEmpty() {
+    }
+
     /**
      * Matcher that expects empty {@link Optional}.
      *
diff --git a/hamcrest/src/main/java/org/hamcrest/optional/package-info.java b/hamcrest/src/main/java/org/hamcrest/optional/package-info.java
new file mode 100644
index 00000000..5be42050
--- /dev/null
+++ b/hamcrest/src/main/java/org/hamcrest/optional/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Matchers that perform comparisons on {@link java.util.Optional} instances.
+ */
+package org.hamcrest.optional;