diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock
index d213237a..f53d71cd 100644
Binary files a/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index b91ba843..2446ea54 100644
Binary files a/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index 39d90df4..c51ce4f3 100644
Binary files a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
index 495bf379..b68a4381 100644
Binary files a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ
diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index c0243cac..6571937f 100644
Binary files a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java b/src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
index 8c1d250b..cd284159 100644
--- a/src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
+++ b/src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 import me.libraryaddict.disguise.DisguiseConfig;
-import me.libraryaddict.disguise.DisguiseListener;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
@@ -42,7 +41,10 @@ public class DisguiseEntityCommand extends BaseDisguiseCommand {
 
     /**
      * Send the player the information
+     * @param sender
+     * @param map
      */
+    @Override
     protected void sendCommandUsage(CommandSender sender, HashMap<DisguiseType, HashMap<ArrayList<String>, Boolean>> map) {
         ArrayList<String> allowedDisguises = getAllowedDisguises(map);
         sender.sendMessage(ChatColor.DARK_GREEN + "Choose a disguise then right click a entity to disguise it!");
diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
index 376d25c3..404dbced 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -19,7 +19,6 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.PacketsManager;
 import me.libraryaddict.disguise.utilities.ReflectionManager;
 import me.libraryaddict.disguise.utilities.DisguiseValues;
-import me.libraryaddict.disguise.utilities.ReflectionManager.LibVersion;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -27,7 +26,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Horse.Variant;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
 
@@ -54,6 +52,7 @@ public abstract class Disguise {
     private boolean velocitySent = DisguiseConfig.isVelocitySent();
     private boolean viewSelfDisguise = DisguiseConfig.isViewDisguises();
     private FlagWatcher watcher;
+    private boolean showName = false;
     
     @Override
     public abstract Disguise clone();
@@ -322,6 +321,7 @@ public abstract class Disguise {
 
     /**
      * Get the disguised entity
+     * @return 
      */
     public Entity getEntity() {
         return entity;
@@ -329,6 +329,7 @@ public abstract class Disguise {
 
     /**
      * Get the disguise type
+     * @return 
      */
     public DisguiseType getType() {
         return disguiseType;
@@ -336,6 +337,7 @@ public abstract class Disguise {
 
     /**
      * Get the flag watcher
+     * @return 
      */
     public FlagWatcher getWatcher() {
         return watcher;
@@ -344,6 +346,7 @@ public abstract class Disguise {
     /**
      * In use doesn't mean that this disguise is active. It means that Lib's Disguises still stores a reference to the disguise.
      * getEntity() can still return null if this disguise is active after despawn, logout, etc.
+     * @return 
      */
     public boolean isDisguiseInUse() {
         return disguiseInUse;
@@ -417,6 +420,14 @@ public abstract class Disguise {
         return velocitySent;
     }
 
+    /**
+     * Returns true if the entity's name is showing through the disguise
+     * @return 
+     */
+    public boolean isShowName() {
+        return showName;
+    }
+
     /**
      * Removes the disguise and undisguises the entity if its using this disguise.
      * 
@@ -482,6 +493,8 @@ public abstract class Disguise {
 
     /**
      * Set the entity of the disguise. Only used for internal things.
+     * @param entity
+     * @return 
      */
     public Disguise setEntity(Entity entity) {
         if (this.getEntity() != null) {
@@ -498,6 +511,11 @@ public abstract class Disguise {
         return this;
     }
 
+    public Disguise setShowName(boolean showName) {
+        this.showName = showName;
+        return this;
+    }
+
     public Disguise setHearSelfDisguise(boolean hearSelfDisguise) {
         this.hearSelfDisguise = hearSelfDisguise;
         return this;
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java
index e04cde40..453aa736 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/PacketsManager.java
@@ -583,7 +583,7 @@ public class PacketsManager {
                                                         nmsEntity) == ReflectionManager.getNmsField("EntityLiving",
                                                         "maxNoDamageTicks").getInt(nmsEntity);
                                             } else {
-                                                hasInvun = (Boolean) ReflectionManager.getNmsMethod("Entity", "isInvulnerable")
+                                                hasInvun = (Boolean) ReflectionManager.getNmsMethod("Entity", "isInvulnerable", DamageSource.class)
                                                         .invoke(nmsEntity, DamageSource.GENERIC);
                                             }
                                         } catch (Exception ex) {
@@ -819,7 +819,7 @@ public class PacketsManager {
                             PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
                             StructureModifier<Object> mods = packet.getModifier();
                             mods.write(0, observer.getEntityId());
-                            List<WrappedWatchableObject> watchableList = new ArrayList<WrappedWatchableObject>();
+                            List<WrappedWatchableObject> watchableList = new ArrayList<>();
                             byte b = (byte) 1 << 5;
                             if (observer.isSprinting())
                                 b = (byte) (b | 1 << 3);