diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 685b0c53b..15aed2ade 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -22,3 +22,15 @@ Expected Results:
 Reproducibility:
 
 Additional Information:
+=======
+### Please perform the following steps before submitting an issue, and confirm by checking the boxes:
+
+- [ ] I have read the README and particularly the FAQ section.
+- [ ] I have checked the Wiki, particularly the USB section.
+- [ ] I have filled out the information below.
+
+### Which particular branch or release are you working on?
+
+### What is your operating system (and kernel version, if applicable)?
+
+### What USB*3* controller are you using?
diff --git a/wrappers/freenect2.i b/wrappers/freenect2.i
new file mode 100644
index 000000000..fe9590944
--- /dev/null
+++ b/wrappers/freenect2.i
@@ -0,0 +1,33 @@
+/* build with:
+   swig2.0 -c++ -DLIBFREENECT2_API -java freenect2.i
+   javac ...
+*/
+
+%module(directors=1) libfreenect2
+
+/* Includes that will be added to the generated xxx_wrap.cpp
+   wrapper file. They will not be interpreted by SWIG */
+
+%{
+#include <string>
+#include "../include/libfreenect2/libfreenect2.hpp"
+%}
+
+%feature("director") Freenect2Device;
+%feature("director") FrameListener;
+%include "std_string.i"
+
+%include ../include/libfreenect2/libfreenect2.hpp
+%include ../include/libfreenect2/frame_listener.hpp
+%include ../include/libfreenect2/registration.h
+
+%pragma(java) jniclasscode=%{
+  static {
+    try {
+      System.loadLibrary("freenect2");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native library freenect2 failed to load.\n" + e);
+      System.exit(1);
+    }
+  }
+%}