diff --git a/README.md b/README.md
index 9120c0e..5d76393 100644
--- a/README.md
+++ b/README.md
@@ -92,34 +92,80 @@ csys = rob.new_csys_from_xpy() #  generate a new csys from 3 points: X, origin,
 rob.set_csys(csys)
 ```
 
+# Supported Grippers
 
-# Robotiq Gripper
+## Robotiq Gripper
 
 urx can also control a Robotiq gripper attached to the UR robot.  The robotiq class was primarily developed by [Mark Silliman](https://github.com/markwsilliman).
 
-## Example use:
+### Example use:
 
 ```python
 import sys
 import urx
-from urx.robotiq_two_finger_gripper import Robotiq_Two_Finger_Gripper
+from urx.gripper import Robotiq_Two_Finger_Gripper
 
 if __name__ == '__main__':
-	rob = urx.Robot("192.168.0.100")
-	robotiqgrip = Robotiq_Two_Finger_Gripper()
+    rob = urx.Robot("192.168.0.100")
+    robotiqgrip = Robotiq_Two_Finger_Gripper()
 
-	if(len(sys.argv) != 2):
-		print "false"
-		sys.exit()
+    if len(sys.argv) != 2:
+        print "false"
+        sys.exit()
 
-	if(sys.argv[1] == "close") :
-		robotiqgrip.close_gripper()
-	if(sys.argv[1] == "open") :
-		robotiqgrip.open_gripper()
+    if sys.argv[1] == "close":
+        robotiqgrip.close_gripper()
+    if sys.argv[1] == "open":
+        robotiqgrip.open_gripper()
 
-	rob.send_program(robotiqgrip.ret_program_to_run())
+    rob.send_program(robotiqgrip.ret_program_to_run())
 
-	rob.close()
-	print "true"
-	sys.exit()
+    rob.close()
+    print "true"
+    sys.exit()
 ```
+
+## OnRobot RG2 Gripper
+
+urx can control an RG2 gripper as well. The class was primarily developed by [Moritz Fey](https://github.com/Mofeywalker).
+
+### Example use:
+
+```python
+import sys
+import urx
+from urx.gripper import OnRobotGripperRG2
+
+if __name__ == '__main__':
+    rob = urx.Robot("192.168.0.100")
+    gripper = OnRobotGripperRG2(rob)
+
+    if len(sys.argv) != 2:
+        print "false"
+        sys.exit()
+
+    if sys.argv[1] == "close":
+        gripper.close_gripper()
+    if sys.argv[1] == "open":
+        gripper.open_gripper()
+
+    rob.close()
+    print "true"
+    sys.exit()
+```
+
+Various parameters can be controlled in the open and close functions. The parameters that can be set are:
+
+```python
+    gripper.open_gripper(
+        target_width=110,  # Width in mm, 110 is fully open
+        target_force=40,  # Maximum force applied in N, 40 is maximum
+        payload=0.5,  # Payload in kg
+        set_payload=False,  # If any payload is attached
+        depth_compensation=False,  # Whether to compensate for finger depth
+        slave=False,  # Is this gripper the master or slave gripper?
+        wait=2  # Wait up to 2s for movement
+    )
+```
+
+The parameters are the same for opening and closing the gripper.
diff --git a/urx/gripper/__init__.py b/urx/gripper/__init__.py
new file mode 100644
index 0000000..8378f4c
--- /dev/null
+++ b/urx/gripper/__init__.py
@@ -0,0 +1,8 @@
+from .robotiq_two_finger_gripper import Robotiq_Two_Finger_Gripper
+from .onrobot_rg2_gripper import OnRobotGripperRG2
+
+
+__all__ = [
+    "Robotiq_Two_Finger_Gripper",
+    "OnRobotGripperRG2",
+]
diff --git a/urx/gripper/onrobot_rg2_gripper.py b/urx/gripper/onrobot_rg2_gripper.py
new file mode 100644
index 0000000..6507084
--- /dev/null
+++ b/urx/gripper/onrobot_rg2_gripper.py
@@ -0,0 +1,273 @@
+
+from urx.urscript import URScript
+import math
+import time
+import os
+
+boilerplate =  """
+  set_standard_analog_input_domain(0, 1)
+  set_standard_analog_input_domain(1, 1)
+  set_tool_analog_input_domain(0, 1)
+  set_tool_analog_input_domain(1, 1)
+  set_analog_outputdomain(0, 0)
+  set_analog_outputdomain(1, 0)
+  set_tool_voltage(0)
+  set_input_actions_to_default()
+  set_tcp(p[0.0,0.0,0.0,0.0,0.0,0.0])
+  set_payload(0.0)
+  set_gravity([0.0, 0.0, 9.82])
+  # begin: URCap Installation Node
+  #   Source: RG - On Robot, 1.9.0, OnRobot A/S
+  #   Type: RG Configuration
+  global measure_width=0
+  global grip_detected=False
+  global lost_grip=False
+  global zsysx=0
+  global zsysy=0
+  global zsysz=0.06935
+  global zsysm=0.7415
+  global zmasx=0
+  global zmasy=0
+  global zmasz=0.18659
+  global zmasm=0
+  global zmasm=0
+  global zslax=0
+  global zslay=0
+  global zslaz=0
+  global zslam=0
+  global zslam=0
+  thread lost_grip_thread():
+    while True:
+      set_tool_voltage(24)
+      if True ==get_digital_in(9):
+        sleep(0.024)
+        if True == grip_detected:
+          if False == get_digital_in(8):
+            grip_detected=False
+            lost_grip=True
+          end
+        end
+        set_tool_analog_input_domain(0, 1)
+        set_tool_analog_input_domain(1, 1)
+        zscale = (get_analog_in(2)-0.026)/2.9760034
+        zangle = zscale*1.57079633+-0.08726646
+        zwidth = 5.0+110*sin(zangle)
+        global measure_width = (floor(zwidth*10))/10-9.2
+      end
+      sync()
+    end
+  end
+  lg_thr = run lost_grip_thread()
+  def RG2(target_width=110, target_force=40, payload=0.0, set_payload=False, depth_compensation=False, slave=False):
+    grip_detected=False
+    if slave:
+      slave_grip_detected=False
+    else:
+      master_grip_detected=False
+    end
+    timeout = 0
+    timeout_limit = 750000
+    while get_digital_in(9) == False:
+      if timeout > timeout_limit:
+        break
+      end
+      timeout = timeout+1
+      sync()
+    end
+    def bit(input):
+      msb=65536
+      local i=0
+      local output=0
+      while i<17:
+        set_digital_out(8,True)
+        if input>=msb:
+          input=input-msb
+          set_digital_out(9,False)
+        else:
+          set_digital_out(9,True)
+        end
+        if get_digital_in(8):
+          out=1
+        end
+        sync()
+        set_digital_out(8,False)
+        sync()
+        input=input*2
+        output=output*2
+        i=i+1
+      end
+      return output
+    end
+    target_width=target_width+9.2
+    if target_force>40:
+      target_force=40
+    end
+    if target_force<4:
+      target_force=4
+    end
+    if target_width>110:
+      target_width=110
+    end
+    if target_width<0:
+      target_width=0
+    end
+    rg_data=floor(target_width)*4
+    rg_data=rg_data+floor(target_force/2)*4*111
+    rg_data=rg_data+32768
+    if slave:
+      rg_data=rg_data+16384
+    end
+    bit(rg_data)
+    if depth_compensation:
+      finger_length = 55.0/1000
+      finger_heigth_disp = 5.0/1000
+      center_displacement = 7.5/1000
+
+      start_pose = get_forward_kin()
+      set_analog_inputrange(2, 1)
+      zscale = (get_analog_in(2)-0.026)/2.9760034
+      zangle = zscale*1.57079633+-0.08726646
+      zwidth = 5.0+110*sin(zangle)
+
+      start_depth = cos(zangle)*finger_length
+
+      sleep(0.016)
+      timeout = 0
+      while get_digital_in(9) == True:
+        timeout=timeout+1
+        sleep(0.008)
+        if timeout > 20:
+          break
+        end
+      end
+      timeout = 0
+      timeout_limit = 750000
+      while get_digital_in(9) == False:
+        zscale = (get_analog_in(2)-0.026)/2.9760034
+        zangle = zscale*1.57079633+-0.08726646
+        zwidth = 5.0+110*sin(zangle)
+        measure_depth = cos(zangle)*finger_length
+        compensation_depth = (measure_depth - start_depth)
+        target_pose = pose_trans(start_pose,p[0,0,-compensation_depth,0,0,0])
+        if timeout > timeout_limit:
+          break
+        end
+        timeout=timeout+1
+        servoj(get_inverse_kin(target_pose),0,0,0.008,0.01,2000)
+        if point_dist(target_pose, get_forward_kin()) > 0.005:
+          popup("Lower grasping force or max width",title="RG-lag threshold exceeded", warning=False, error=False, blocking=False)
+        end
+      end
+      nspeed = norm(get_actual_tcp_speed())
+      while nspeed > 0.001:
+        servoj(get_inverse_kin(target_pose),0,0,0.008,0.01,2000)
+        nspeed = norm(get_actual_tcp_speed())
+      end
+        stopj(2)
+    end
+    if depth_compensation==False:
+      timeout = 0
+      timeout_count=20*0.008/0.008
+      while get_digital_in(9) == True:
+        timeout = timeout+1
+        sync()
+        if timeout > timeout_count:
+          break
+        end
+      end
+      timeout = 0
+      timeout_limit = 750000
+      while get_digital_in(9) == False:
+        timeout = timeout+1
+        sync()
+        if timeout > timeout_limit:
+          break
+        end
+      end
+      end
+      sleep(0.024)
+      if set_payload:
+        if slave:
+          if get_analog_in(3) < 2:
+            zslam=0
+          else:
+            zslam=payload
+          end
+        else:
+          if get_digital_in(8) == False:
+            zmasm=0
+          else:
+            zmasm=payload
+          end
+        end
+        zload=zmasm+zslam+zsysm
+        set_payload(zload,[(zsysx*zsysm+zmasx*zmasm+zslax*zslam)/zload,(zsysy*zsysm+zmasy*zmasm+zslay*zslam)/zload,(zsysz*zsysm+zmasz*zmasm+zslaz*zslam)/zload])
+      end
+      master_grip_detected=False
+      master_lost_grip=False
+      slave_grip_detected=False
+      slave_lost_grip=False
+      if True == get_digital_in(8):
+        master_grip_detected=True
+      end
+      if get_analog_in(3)>2:
+        slave_grip_detected=True
+      end
+      grip_detected=False
+      lost_grip=False
+      if True == get_digital_in(8):
+        grip_detected=True
+      end
+      zscale = (get_analog_in(2)-0.026)/2.9760034
+      zangle = zscale*1.57079633+-0.08726646
+      zwidth = 5.0+110*sin(zangle)
+      global measure_width = (floor(zwidth*10))/10-9.2
+      if slave:
+        slave_measure_width=measure_width
+      else:
+        master_measure_width=measure_width
+      end
+      return grip_detected
+    end
+  set_tool_voltage(24)
+  set_tcp(p[0,0,0.18659,0,-0,0])
+  """
+class OnRobotGripperRG2Script(URScript):
+    
+    def __init__(self):
+        super(OnRobotGripperRG2Script, self).__init__()
+        # copy the boilerplate to the start of the script to make the RG2() function available
+        self.add_line_to_program(boilerplate)
+
+    def _rg2_command(self, target_width=110, target_force=40, payload=0.5, set_payload=False, depth_compensation=False, slave=False):
+        self.add_line_to_program("RG2(target_width={}, target_force={}, payload={}, set_payload={}, depth_compensation={}, slave={})"
+                                 .format(target_width, target_force, payload, set_payload, depth_compensation, slave))
+
+class OnRobotGripperRG2(object):
+
+    def __init__(self, robot):
+        self.robot = robot
+
+    def open_gripper(self, target_width=110, target_force=40, payload=0.5, set_payload=False, depth_compensation=False, slave=False, wait=2):
+        urscript = OnRobotGripperRG2Script()
+        urscript._rg2_command(target_width, target_force, payload, set_payload, depth_compensation, slave)
+        self.robot.send_program(urscript())
+        time.sleep(wait)
+
+    def close_gripper(self, target_width=-10, target_force=40, payload=0.5, set_payload=False, depth_compensation=False, slave=False, wait=2):
+        urscript = OnRobotGripperRG2Script()
+        urscript._rg2_command(target_width, target_force, payload, set_payload, depth_compensation, slave)
+        self.robot.send_program(urscript())
+        time.sleep(wait)
+
+    @property
+    def width(self):
+        zscale = (self.robot.get_analog_in(2) - 0.026) / 2.9760034
+        zangle = zscale * 1.57079633 + -0.08726646
+        zwidth = 5.0 + 110 * math.sin(zangle)
+        measure_width = (math.floor(zwidth * 10)) / 10 - 9.2
+        return measure_width
+
+    @property
+    def object_gripped(self):
+        return self.robot.get_digital_in(16) > 0
diff --git a/urx/robotiq_two_finger_gripper.py b/urx/gripper/robotiq_two_finger_gripper.py
similarity index 100%
rename from urx/robotiq_two_finger_gripper.py
rename to urx/gripper/robotiq_two_finger_gripper.py
diff --git a/urx/urrobot.py b/urx/urrobot.py
index 94c87f5..f955c44 100644
--- a/urx/urrobot.py
+++ b/urx/urrobot.py
@@ -279,6 +279,17 @@ def movej(self, joints, acc=0.1, vel=0.05, wait=True, relative=False, threshold=
             self._wait_for_move(joints[:6], threshold=threshold, joints=True)
             return self.getj()
 
+    def movej_to_pose(self, tpose, acc=0.1, vel=0.05, wait=True, relative=False, threshold=None):
+        if relative:
+            l = self.getl()
+            tpose = [v + l[i] for i, v in enumerate(tpose)]
+        prog = self._format_move("movej", tpose, acc, vel, prefix="p")
+        print(prog)
+        self.send_program(prog)
+        if wait:
+            self._wait_for_move(tpose[:6], threshold=threshold, joints=False)
+            return self.getj()
+
     def movel(self, tpose, acc=0.01, vel=0.01, wait=True, relative=False, threshold=None):
         """
         Send a movel command to the robot. See URScript documentation.
diff --git a/urx/ursecmon.py b/urx/ursecmon.py
index e7b3189..994807f 100644
--- a/urx/ursecmon.py
+++ b/urx/ursecmon.py
@@ -411,13 +411,22 @@ def get_analog_in(self, nb, wait=False):
         if wait:
             self.wait()
         with self._dictLock:
-            return self._dict["MasterBoardData"]["analogInput" + str(nb)]
+            analog_input = "analogInput" + str(nb)
+            if analog_input in self._dict["MasterBoardData"]:
+                return self._dict["MasterBoardData"][analog_input]
+            else:
+                return self._dict["ToolData"][analog_input]
 
     def get_analog_inputs(self, wait=False):
         if wait:
             self.wait()
         with self._dictLock:
-            return self._dict["MasterBoardData"]["analogInput0"], self._dict["MasterBoardData"]["analogInput1"]
+            return (
+                self._dict["MasterBoardData"]["analogInput0"],
+                self._dict["MasterBoardData"]["analogInput1"],
+                self._dict["ToolData"]["analogInput2"],
+                self._dict["ToolData"]["analogInput3"],
+            )
 
     def is_program_running(self, wait=False):
         """