diff --git a/leap_lib/LeapJava.jar b/leap_lib/LeapJava.jar
index 508848c..4b0db6a 100644
Binary files a/leap_lib/LeapJava.jar and b/leap_lib/LeapJava.jar differ
diff --git a/leap_lib/libLeap.so b/leap_lib/libLeap.so
new file mode 100755
index 0000000..088c0b9
Binary files /dev/null and b/leap_lib/libLeap.so differ
diff --git a/leap_lib/libLeapJava.so b/leap_lib/libLeapJava.so
new file mode 100755
index 0000000..c67dfb8
Binary files /dev/null and b/leap_lib/libLeapJava.so differ
diff --git a/leap_lib/x64/libLeap.so b/leap_lib/x64/libLeap.so
new file mode 100755
index 0000000..088c0b9
Binary files /dev/null and b/leap_lib/x64/libLeap.so differ
diff --git a/leap_lib/x64/libLeapJava.so b/leap_lib/x64/libLeapJava.so
new file mode 100755
index 0000000..c67dfb8
Binary files /dev/null and b/leap_lib/x64/libLeapJava.so differ
diff --git a/leap_lib/x86/libLeap.so b/leap_lib/x86/libLeap.so
new file mode 100755
index 0000000..69932bd
Binary files /dev/null and b/leap_lib/x86/libLeap.so differ
diff --git a/leap_lib/x86/libLeapJava.so b/leap_lib/x86/libLeapJava.so
new file mode 100755
index 0000000..00eecf9
Binary files /dev/null and b/leap_lib/x86/libLeapJava.so differ
diff --git a/src/clojure_leap/controller.clj b/src/clojure_leap/controller.clj
index 8cb1851..f391143 100644
--- a/src/clojure_leap/controller.clj
+++ b/src/clojure_leap/controller.clj
@@ -15,11 +15,11 @@
   (vec (keep #(try (frame controller %) (catch Exception e nil)) (range history-count))))
 
 (defn ^ScreenList screens [^Controller controller]
-  (.calibratedScreens controller))
+  (.locatedScreens controller))
 
 (defn ^Screen screen [^Controller controller]
   ;; There is a guarantee that there is at least one screen
-  (first (.calibratedScreens controller)))
+  (first (.locatedScreens controller)))
 
 (defn connected? [^Controller controller]
   (.isConnected controller))
diff --git a/src/clojure_leap/finger.clj b/src/clojure_leap/finger.clj
index dbd54a1..c39021d 100644
--- a/src/clojure_leap/finger.clj
+++ b/src/clojure_leap/finger.clj
@@ -9,7 +9,7 @@
   (.count finger-list))
 
 (defn empty? [^FingerList finger-list]
-  (.empty finger-list))
+  (.isEmpty finger-list))
 
 ;; Finger
 ;;;;;;;;;;;;;;;
diff --git a/src/clojure_leap/frame.clj b/src/clojure_leap/frame.clj
index 0ac204c..9e00e6a 100644
--- a/src/clojure_leap/frame.clj
+++ b/src/clojure_leap/frame.clj
@@ -13,7 +13,7 @@
   (.hands frame))
  
 (defn hands? [^Frame frame]
-  (not (.empty (.hands frame))))
+  (not (.isEmpty (.hands frame))))
 
 (defn single-hand? [^Frame frame]
   (= 1 (.count (.hands frame))))
@@ -61,7 +61,7 @@
 (defn fingers?
   "Are there any fingers detected for a given Frame"
   [^Frame frame]
-  (not (.empty (.fingers frame))))
+  (not (.isEmpty (.fingers frame))))
 
 (defn ^Finger raw-finger [^Frame frame finger-id]
   (.finger frame finger-id))
@@ -92,7 +92,7 @@
   (.tools frame))
 
 (defn tools? [^Frame frame]
-  (not (.empty (.tools frame))))
+  (not (.isEmpty (.tools frame))))
 
 (defn ^Tool raw-tool [^Frame frame tool-id]
   (.tool frame tool-id))
@@ -123,7 +123,7 @@
   (.pointables frame))
 
 (defn pointables? [^Frame frame]
-  (not (.empty (.pointables frame))))
+  (not (.isEmpty (.pointables frame))))
 
 (defn ^Pointable raw-pointable [^Frame frame pointable-id]
   (.pointable frame pointable-id))
diff --git a/src/clojure_leap/hand.clj b/src/clojure_leap/hand.clj
index 2174ccb..888b36d 100644
--- a/src/clojure_leap/hand.clj
+++ b/src/clojure_leap/hand.clj
@@ -16,7 +16,7 @@
   (.count hand-list))
 
 (defn empty? [^HandList hand-list]
-  (.empty hand-list))
+  (.isEmpty hand-list))
 
 
 ;; Hand
@@ -35,7 +35,7 @@
 (defn fingers?
   "Are there any fingers detected for a given Hand"
   [^Hand hand]
-  (not (.empty (.fingers hand))))
+  (not (.isEmpty (.fingers hand))))
 
 (defn ^Finger raw-finger [^Hand hand finger-id]
   (.finger hand finger-id))
@@ -66,7 +66,7 @@
   (.tools hand))
 
 (defn tools? [^Hand hand]
-  (not (.empty (.tools hand))))
+  (not (.isEmpty (.tools hand))))
 
 (defn ^Tool raw-tool [^Hand hand tool-id]
   (.tool hand tool-id))
@@ -97,7 +97,7 @@
   (.pointables hand))
 
 (defn pointables? [^Hand hand]
-  (not (.empty (.pointables hand))))
+  (not (.isEmpty (.pointables hand))))
 
 (defn ^Pointable raw-pointable [^Hand hand pointable-id]
   (.pointable hand pointable-id))
@@ -127,7 +127,7 @@
 (defn fist?
   "Are we detecting a possible fist? - a hand with no fingers/tools/pointables"
   [^Hand hand]
-  (.empty (.pointables hand)))
+  (.isEmpty (.pointables hand)))
 
 (defn ^Vector direction [^Hand hand]
   (.direction hand))
diff --git a/src/clojure_leap/tool.clj b/src/clojure_leap/tool.clj
index 8777caf..ee5cb91 100644
--- a/src/clojure_leap/tool.clj
+++ b/src/clojure_leap/tool.clj
@@ -9,7 +9,7 @@
   (.count tool-list))
 
 (defn empty? [^ToolList tool-list]
-  (.empty tool-list))
+  (.isEmpty tool-list))
 
 ;; Tool
 ;;;;;;;;;;;;;;;