diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java
index b585b7314c2beab17f783d885e86c9bcac7907f0..0fb4546e00c82c4b4f71fb63c211ff0888ad4d41 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClient.java
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
 /**
  * Client implementation for actionlib.
  * This class encapsulates the communication with an actionlib server.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  */
 public class ActionClient<T_ACTION_GOAL extends Message,
   T_ACTION_FEEDBACK extends Message,
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java
index bc80d036d51e350c117921833aa306f3a3548abe..48ee9bc42458df85354d7e88f60fd43f18aa72fe 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionClientListener.java
@@ -24,7 +24,7 @@ import actionlib_msgs.GoalStatusArray;
  * Listener interface to receive the incoming messages from the ActionLib server.
  * A client should implement this interface if it wants to receive the callbacks
  * with information from the server.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  */
 public interface ActionClientListener<T_ACTION_FEEDBACK extends Message,
   T_ACTION_RESULT extends Message> {
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java
index 858f7878ae48306cd34520129ffbadee50980e39..be6e3bf94c04da41b43cd81f97c59fb5a7c466f1 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServer.java
@@ -35,7 +35,7 @@ import actionlib_msgs.GoalStatus;
 
 /**
  * Class to encapsulate the actiolib server's communication and goal management.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  */
 public class ActionServer<T_ACTION_GOAL extends Message,
   T_ACTION_FEEDBACK extends Message,
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java
index 42436253818869f61b9a1053229d34274ebd45ee..540b68283fee93f9d3c353a9959e22c40698c8cb 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ActionServerListener.java
@@ -24,7 +24,7 @@ import actionlib_msgs.GoalID;
  * Listener interface to receive the incoming messages from the ActionLib client.
  * A server should implement this interface if it wants to receive the callbacks
  * with information from the client.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  */
 public interface ActionServerListener<T_ACTION_GOAL extends Message> {
   /**
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ClientStateMachine.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ClientStateMachine.java
index 7dbbb8d7bcebf8bb64e1479f07e05c6561b7f97e..a4f16801a221688d0952d510155c44fadff3a121 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ClientStateMachine.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ClientStateMachine.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
 
 /**
  * State machine for the action client.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  * Comments:
  *   - The state returned on a transition is actually a vector of states that should be transitioned in sequence.
  *  TODO: change class name to ClientStateMachine
@@ -79,7 +79,6 @@ public class ClientStateMachine {
 
   /**
    * Update the state of the client based on the current state and the goal state.
-   * Note: This method uses a mutex in the original implementation so we make it synchronized.
    */
   public synchronized void updateStatus(int status)
   {
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java
index fb335b6af5892eaf4c815453eb8fe41f957420ca..715440be7d4ca52e5aedfe2053d93a4ea91e3b0a 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/ServerStateMachine.java
@@ -21,7 +21,7 @@ import actionlib_msgs.GoalStatus;
 
 /*
  * Class to manage the server state machine transitions.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  */
 public class ServerStateMachine {
   public static class Events {
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java
index f58714fccffde56681b74caf6ab1aa1b5e3121e9..244f3f15c50e4e45935a8f04a517b32fa3cfa2b0 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestClient.java
@@ -33,7 +33,7 @@ import actionlib_msgs.GoalStatus;
 
 /**
  * Class to test the actionlib client.
- * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+ * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
  */
 public class TestClient extends AbstractNodeMain implements ActionClientListener<FibonacciActionFeedback, FibonacciActionResult> {
   private ActionClient ac = null;
diff --git a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java
index 626da461f1b980525d175f04e04150fadda79f35..225d7a7213e58cae1e0782fda9adcd3a4391e029 100644
--- a/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java
+++ b/src/rosjava_actionlib/rosjava_actionlib/src/main/java/com/github/ekumen/rosjava_actionlib/TestServer.java
@@ -33,7 +33,7 @@ import actionlib_msgs.GoalStatus;
 
   /**
    * Class to test the actionlib server.
-   * @author Ernesto Corbellini <ecorbellini@ekumenlabs.com>
+   * @author Ernesto Corbellini ecorbellini@ekumenlabs.com
    */
 public class TestServer extends AbstractNodeMain implements ActionServerListener<FibonacciActionGoal> {
   private ActionServer<FibonacciActionGoal, FibonacciActionFeedback, FibonacciActionResult> as = null;