diff --git a/src/dynamixelserver.cpp b/src/dynamixelserver.cpp
index 7b21203760f3904e5244c82c9c71a4be79e0b9fb..7f503a10a73d4bb1a9919ad6fd4177a318984a12 100644
--- a/src/dynamixelserver.cpp
+++ b/src/dynamixelserver.cpp
@@ -2,7 +2,6 @@
 #include "dynamixelserver.h"
 #include "eventexceptions.h"
 #include <sstream>
-#include <iostream>
 
 const unsigned short crc_table[256] = {
         0x0000, 0x8005, 0x800F, 0x000A, 0x801B, 0x001E, 0x0014, 0x8011,
@@ -591,7 +590,6 @@ void *CDynamixelServer::scan_thread(void *param)
       }
       for(freq=0;freq<9;freq++)
       {
-        std::cout << "trying frequency: " << frequencies[freq] << std::endl;
         dyn_server->set_baudrate(frequencies[freq]);
         for(id=0;id<0xFD;id++)
         {
@@ -605,9 +603,7 @@ void *CDynamixelServer::scan_thread(void *param)
           else
           {
             try{
-              std::cout << "checking device ID: " << id << std::endl;
               dyn_server->ping(id,20,dyn_server->scan_version);
-              std::cout << "Found device with ID: " << id << std::endl;
             }catch(CEventTimeoutException &e){
               continue;
             }
@@ -661,6 +657,10 @@ void CDynamixelServer::start_scan(dyn_version_t version)
     this->stop_scan();
     this->devices_v1.clear();
     this->devices_v2.clear();
+    if(this->event_server->event_is_set(this->stop_scan_event_id))
+      this->event_server->reset_event(this->stop_scan_event_id);
+    if(this->event_server->event_is_set(this->scan_error_event_id))
+      this->event_server->reset_event(this->scan_error_event_id);
     this->thread_server->start_thread(this->scan_thread_id);
   }
 }
diff --git a/src/examples/test_dynamixel_server.cpp b/src/examples/test_dynamixel_server.cpp
index b8567e82a5856ba34ecf67a07ed2e3b828afa7b3..8e3ed0f5a3e0e65793a7c54e51fc0b3910afcb24 100644
--- a/src/examples/test_dynamixel_server.cpp
+++ b/src/examples/test_dynamixel_server.cpp
@@ -41,7 +41,6 @@ int main(int argc, char *argv[])
     }
     else
       std::cout << "Error while scanning the bus: " << dyn_server->get_scan_error() << std::endl;
-    return 0;
     try{
       dyn_server->config_bus(0,1000000);
       dyn_server->start_scan();