diff --git a/EaglerMOTD.jar b/EaglerMOTD.jar
index 6afe606..cb424ee 100644
Binary files a/EaglerMOTD.jar and b/EaglerMOTD.jar differ
diff --git a/README.md b/README.md
index e750a01..3824c05 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+### THIS IS A BUNGEE PLUGIN! Install in 'bungee_command/plugins' not 'bukkit_command/plugins'
+
 # EaglerMOTD
 
 ### This plugin can add animated MOTDs to your Eaglercraft server
diff --git a/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java b/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java
index bdb35ad..561742c 100644
--- a/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java
+++ b/src/net/lax1dude/eaglercraft/eaglermotd/MOTDConnection.java
@@ -117,7 +117,12 @@ public class MOTDConnection {
 				currentFrame = currentMessage.random ? rand.nextInt(currentMessage.frames.size()) : 0;
 				applyFrame(currentMessage.frames.get(currentFrame));
 				motd.sendToUser();
-				return true;
+				if(currentMessage.next == null && currentMessage.interval <= 0) {
+					motd.close();
+					return false;
+				}else {
+					return true;
+				}
 			}else {
 				this.motd.close();
 				return false;
@@ -143,7 +148,12 @@ public class MOTDConnection {
 					motd.sendToUser();
 				}
 			}
-			return true;
+			if(currentMessage.next == null && currentMessage.interval <= 0) {
+				motd.close();
+				return false;
+			}else {
+				return true;
+			}
 		}
 	}