diff --git a/changelog.md b/changelog.md
index ecdf296f..0f8c6424 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,23 +7,27 @@ See matterbridge.toml.sample for an example
 ### General
 * Allow for bridging the same type of bridge, which means you can eg bridge between multiple mattermosts.
 * The bridge is now actually a gateway which has support multiple in and out bridges. (and supports multiple gateways).
-* Discord support added. See matterbridge.toml.sample for more information
+* Discord support added. See matterbridge.toml.sample for more information.
 * Samechannelgateway support added, easier configuration for 1:1 mapping of protocols with same channel names. #35
-* Better debugging output
-* discord: new protocol support added (http://www.discordapp.com)
-* mattermost: Support attachments 
-* irc: Strip colors #33
+* Support for override from environment variables. #50
+* Better debugging output.
+* discord: New protocol support added. (http://www.discordapp.com)
+* mattermost: Support attachments.
+* irc: Strip colors. #33
+* irc: Anti-flooding support. #40
+* irc: Forward channel notices.
 
 ## Bugfix
-* irc: Split newlines #37
-* irc: Only respond to nick related notices from nickserv
-* irc: Ignore queries send to the bot
-* irc: Ignore messages from ourself
-* irc: only output the "users on irc information" when asked with "!users"
-* mattermost: Fix mattermost channel joins
-* mattermost: drop messages not from our team
-* slack: do not panic on non-existing channels
-* general: exit when a bridge fails to start
+* irc: Split newlines. #37
+* irc: Only respond to nick related notices from nickserv.
+* irc: Ignore queries send to the bot.
+* irc: Ignore messages from ourself.
+* irc: Only output the "users on irc information" when asked with "!users".
+* irc: Actually wait until connection is complete before saying it is.
+* mattermost: Fix mattermost channel joins.
+* mattermost: Drop messages not from our team.
+* slack: Do not panic on non-existing channels.
+* general: Exit when a bridge fails to start.
 
 # v0.6.1
 ## New features
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 90a21300..f01a3b48 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -49,6 +49,17 @@ RemoteNickFormat="[{PROTOCOL}] <{NICK}> "
 #OPTIONAL
 IgnoreNicks="ircspammer1 ircspammer2"
 
+#Flood control
+#Delay in milliseconds between each message send to the IRC server
+#OPTIONAL (default 1300)
+MessageDelay=1300
+
+#Maximum amount of messages to hold in queue. If queue is full 
+#messages will be dropped. 
+#<clipped> will be add to the message that fills the queue.
+#OPTIONAL (default 30)
+MessageQueue=30
+
 ###################################################################
 #XMPP section
 ###################################################################