diff --git a/README.md b/README.md
index 84db5314..79bb42d9 100644
--- a/README.md
+++ b/README.md
@@ -431,13 +431,13 @@ Conversation.create(adminMessage);
 // send a message from a user
 UserMessage userMessage = new UserMessage()
     .setBody("Hey! Is there, is there a reward?")
-    .setFrom(user);
+    .setUser(user);
 Conversation.create(userMessage);
 
 // send a message from a contact
 ContactMessage contactMessage = new ContactMessage()
     .setBody("Hey! Is there, is there a reward?")
-    .setFrom(contact);
+    .setUser(contact);
 Conversation.create(contactMessage);
 
 //list all conversations
diff --git a/build.gradle b/build.gradle
index f06bb10d..47dd0d21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,11 +33,6 @@ subprojects {
     mavenCentral()
   }
 
-  ext {
-    jacksonVersion = '2.9.6'
-    powermockVersion = '1.6.6'
-  }
-
   apply plugin: 'maven'
   apply plugin: 'maven-publish'
   apply plugin: 'java'
@@ -48,18 +43,19 @@ subprojects {
 
   //noinspection GroovyAssignabilityCheck
   dependencies {
-    compile "com.fasterxml.jackson.core:jackson-core:$jacksonVersion"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
-    compile "com.google.guava:guava:17.0"
-    compile "org.slf4j:slf4j-api:1.7.25"
-    compile "commons-codec:commons-codec:1.9"
-    testCompile "junit:junit:4.12"
-    testCompile "org.powermock:powermock-module-junit4:$powermockVersion"
-    testCompile "org.powermock:powermock-api-mockito:$powermockVersion"
+    compile 'com.fasterxml.jackson.core:jackson-core:2.4.2'
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.2'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
+    compile 'com.google.guava:guava:17.0'
+    compile 'org.slf4j:slf4j-api:1.7.7'
+    compile 'commons-codec:commons-codec:1.9'
+    testCompile 'junit:junit:4.11'
+    testCompile 'org.powermock:powermock-module-junit4:1.6.6'
+    testCompile 'org.powermock:powermock-api-mockito:1.6.6'
   }
 }
 
+
 task wrapper(type: Wrapper) {
   gradleVersion = '2.0'
 }
diff --git a/intercom-java/src/main/java/io/intercom/api/Company.java b/intercom-java/src/main/java/io/intercom/api/Company.java
index 197872b1..3824b825 100644
--- a/intercom-java/src/main/java/io/intercom/api/Company.java
+++ b/intercom-java/src/main/java/io/intercom/api/Company.java
@@ -49,6 +49,10 @@ public static Company update(Company company) throws InvalidException, Authoriza
         return DataResource.update(entity, "companies", Company.class);
     }
 
+    public static Company delete(String id) throws InvalidException, AuthorizationException {
+        return DataResource.delete(id, "companies", Company.class);
+    }
+
     public static CompanyCollection list(Map<String, String> params) throws InvalidException, AuthorizationException {
         return DataResource.list(params, "companies", CompanyCollection.class);
     }
diff --git a/intercom-java/src/main/java/io/intercom/api/Tag.java b/intercom-java/src/main/java/io/intercom/api/Tag.java
index 8a4085a5..2482e2ba 100644
--- a/intercom-java/src/main/java/io/intercom/api/Tag.java
+++ b/intercom-java/src/main/java/io/intercom/api/Tag.java
@@ -83,12 +83,12 @@ static TaggableCollection createTagTypedCollection(Tag tag, UserCollection users
             if (!Strings.isNullOrEmpty(id)) {
                 userMap.put("id", id);
                 usersLite.add(userMap);
-            } else if (!Strings.isNullOrEmpty(userId)) {
-                userMap.put("user_id", userId);
-                usersLite.add(userMap);
             } else if (!Strings.isNullOrEmpty(email)) {
                 userMap.put("email", email);
                 usersLite.add(userMap);
+            } else if (!Strings.isNullOrEmpty(userId)) {
+                userMap.put("user_id", userId);
+                usersLite.add(userMap);
             } else {
                 logger.warn("no identifiers found for user tag target, skipping [" + tag + "] [" + user.toString() + "]");
             }