diff --git a/src/emqttd.erl b/src/emqttd.erl
index c360a5870..587a46306 100644
--- a/src/emqttd.erl
+++ b/src/emqttd.erl
@@ -22,7 +22,7 @@
 
 -include("emqttd_protocol.hrl").
 
--export([start/0, env/1, env/2, is_running/1]).
+-export([start/0, env/1, env/2, is_running/1, stop/0]).
 
 %% PubSub API
 -export([subscribe/1, subscribe/2, subscribe/3, publish/1,
@@ -57,6 +57,12 @@
 -spec(start() -> ok | {error, any()}).
 start() -> application:start(?APP).
 
+%% @doc Stop emqttd application.
+-spec(stop() -> ok | {error, any()}).
+stop() ->
+    emqttd_plugins:unload(),
+    init:stop().
+
 %% @doc Environment
 -spec(env(Key:: atom()) -> {ok, any()} | undefined).
 env(Key) -> application:get_env(?APP, Key).
diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl
index b6add0581..99de19d50 100644
--- a/src/emqttd_session.erl
+++ b/src/emqttd_session.erl
@@ -338,7 +338,7 @@ handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client
 
 %% 
 handle_cast({destroy, ClientId}, Session = #session{client_id = ClientId, client_pid = OldClientPid}) ->
-    ?LOG(warning, "kickedout~p", [OldClientPid], Session),
+    ?LOG(warning, "kicked out~p", [OldClientPid], Session),
     shutdown(conflict, Session);