diff --git a/.gitignore b/.gitignore
index 41f071a..c05d7ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,8 @@
 .metadata/**
 .recommenders/**
-*.class
-*.dtd
-*.lst
-*.lock
-*.lo
-*.jar
+.settings/**
+bin/**
+target/**
+
 *.project
 *.classpath
-*.prefs
-*.map
-*.zip
-*.sha
-*.sha
-**/build.xml
-**/pom.xml
-*.MF
-*.sh
-/bin/
-/target/
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..bd4d7f3
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>me.coley</groupId>
+	<artifactId>simple-jna</artifactId>
+	<version>1.0</version>
+	<name>Simple-JNA</name>
+	<description>Wrappers for JNA, ease of use.</description>
+	<dependencies>
+		<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna -->
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna</artifactId>
+			<version>4.5.1</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/net.java.dev.jna/jna-platform -->
+		<dependency>
+			<groupId>net.java.dev.jna</groupId>
+			<artifactId>jna-platform</artifactId>
+			<version>4.5.1</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>		
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.6.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/src/me/coley/simplejna/hook/key/KeyEventReceiver.java b/src/me/coley/simplejna/hook/key/KeyEventReceiver.java
index e747399..c8b0e97 100644
--- a/src/me/coley/simplejna/hook/key/KeyEventReceiver.java
+++ b/src/me/coley/simplejna/hook/key/KeyEventReceiver.java
@@ -56,7 +56,7 @@ public LRESULT callback(int nCode, WPARAM wParam, KBDLLHOOKSTRUCT info) {
 	 * 
 	 * @author Matt
 	 */
-	enum SystemState {
+	public enum SystemState {
 		SYSTEM, STANDARD;
 
 		public static SystemState from(int code) {
@@ -69,7 +69,7 @@ public static SystemState from(int code) {
 	 * 
 	 * @author Matt
 	 */
-	enum PressState {
+	public enum PressState {
 		UP, DOWN, UNKNOWN;
 
 		public static PressState from(int code) {
diff --git a/src/me/coley/simplejna/hook/mouse/MouseEventReceiver.java b/src/me/coley/simplejna/hook/mouse/MouseEventReceiver.java
index 40d3636..62caecf 100644
--- a/src/me/coley/simplejna/hook/mouse/MouseEventReceiver.java
+++ b/src/me/coley/simplejna/hook/mouse/MouseEventReceiver.java
@@ -56,6 +56,8 @@ public LRESULT callback(int nCode, WPARAM wParam, MOUSEHOOKSTRUCT info) {
 	 * 
 	 * @param type
 	 *            Type is press <i>(Left, Right, Middle)</i>
+	 * @param hwnd
+	 *            Window handle that receives the event.
 	 * @param info
 	 *            Mouse information.
 	 * @return Event cancellation
@@ -78,6 +80,8 @@ public LRESULT callback(int nCode, WPARAM wParam, MOUSEHOOKSTRUCT info) {
 	 * 
 	 * @param down
 	 *            Scroll event is down <i>(Negative movement)</i>
+	 * @param hwnd
+	 *            Window handle that receives the event.
 	 * @param info
 	 *            Mouse information.
 	 * @return Event cancellation
@@ -87,6 +91,8 @@ public LRESULT callback(int nCode, WPARAM wParam, MOUSEHOOKSTRUCT info) {
 	/**
 	 * Called when the mouse wheel is moved. Returning true will cancel the event.
 	 * 
+	 * @param hwnd
+	 *            Window handle that receives the event.
 	 * @param info
 	 *            Mouse information.
 	 * @return Event cancellation