diff --git a/c_src/cecho.c b/c_src/cecho.c
index dddabf9..850d1a2 100644
--- a/c_src/cecho.c
+++ b/c_src/cecho.c
@@ -1,5 +1,6 @@
 //==============================================================================
 // Copyright 2010 Erlang Solutions Ltd.
+// Author: Mazen Harake (mazen.harake@gmail.com)
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/c_src/cecho.h b/c_src/cecho.h
index 9735634..35386f9 100644
--- a/c_src/cecho.h
+++ b/c_src/cecho.h
@@ -1,5 +1,6 @@
 //==============================================================================
 // Copyright 2010 Erlang Solutions Ltd.
+// Author: Mazen Harake (mazen.harake@gmail.com)
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/c_src/cecho_commands.h b/c_src/cecho_commands.h
index 18ed946..47dec4c 100644
--- a/c_src/cecho_commands.h
+++ b/c_src/cecho_commands.h
@@ -1,5 +1,6 @@
 //==============================================================================
 // Copyright 2010 Erlang Solutions Ltd.
+// Author: Mazen Harake (mazen.harake@gmail.com)
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/cecho.erl b/src/cecho.erl
index 7fcfa22..a2381f5 100644
--- a/src/cecho.erl
+++ b/src/cecho.erl
@@ -1,5 +1,6 @@
 %%==============================================================================
 %% Copyright 2010 Erlang Solutions Ltd.
+%% Author: Mazen Harake (mazen.harake@gmail.com)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
 
 -module(cecho).
 
--author('mazen.harake@erlang-solutions.com').
+-author('mazen.harake@gmail.com').
 
 -behaviour(application).
 -include("include/cecho.hrl").
diff --git a/src/cecho_example.erl b/src/cecho_example.erl
index 94490ce..ce9f72a 100644
--- a/src/cecho_example.erl
+++ b/src/cecho_example.erl
@@ -1,5 +1,6 @@
 %%==============================================================================
 %% Copyright 2010 Erlang Solutions Ltd.
+%% Author: Mazen Harake (mazen.harake@gmail.com)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
 
 -module(cecho_example).
 
--author('mazen.harake@erlang-solutions.com').
+-author('mazen.harake@gmail.com').
 
 -compile(export_all).
 
diff --git a/src/cecho_srv.erl b/src/cecho_srv.erl
index 3b90ef2..61ecee9 100644
--- a/src/cecho_srv.erl
+++ b/src/cecho_srv.erl
@@ -1,5 +1,6 @@
 %%==============================================================================
 %% Copyright 2010 Erlang Solutions Ltd.
+%% Author: Mazen Harake (mazen.harake@gmail.com)
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@
 
 -module(cecho_srv).
 
--author('mazen.harake@erlang-solutions.com').
+-author('mazen.harake@gmail.com').
 
 -behaviour(gen_server).
 -include("cecho.hrl").