diff --git a/exam1/execve-stack.nasm b/exam1/execve-stack.nasm
index 77df821..cbcf101 100644
--- a/exam1/execve-stack.nasm
+++ b/exam1/execve-stack.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start
diff --git a/exam1/shell_bind_tcp.nasm b/exam1/shell_bind_tcp.nasm
index 4de6816..77ce7be 100644
--- a/exam1/shell_bind_tcp.nasm
+++ b/exam1/shell_bind_tcp.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: shell_bind_tcp.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ; DESC:
diff --git a/exam1/shell_bind_tcp_smaller.nasm b/exam1/shell_bind_tcp_smaller.nasm
index 25cfd43..154d960 100644
--- a/exam1/shell_bind_tcp_smaller.nasm
+++ b/exam1/shell_bind_tcp_smaller.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: shell_bind_tcp_smaller.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ; DESC:
diff --git a/exam2/shell_reverse_tcp.nasm b/exam2/shell_reverse_tcp.nasm
index 962d433..83f82cf 100644
--- a/exam2/shell_reverse_tcp.nasm
+++ b/exam2/shell_reverse_tcp.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: shell_reverse_tcp.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ; DESC:
diff --git a/exam3/access-noloop/hunter.nasm b/exam3/access-noloop/hunter.nasm
index 712a8e3..9790675 100644
--- a/exam3/access-noloop/hunter.nasm
+++ b/exam3/access-noloop/hunter.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: hunter.nasm *access +noloop modification
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ;
diff --git a/exam3/access-noloop/payload.nasm b/exam3/access-noloop/payload.nasm
index 1ab23b8..9d8020d 100644
--- a/exam3/access-noloop/payload.nasm
+++ b/exam3/access-noloop/payload.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: payload-execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start
diff --git a/exam3/access-scasd-noloop/hunter.nasm b/exam3/access-scasd-noloop/hunter.nasm
index 3774230..34a4290 100644
--- a/exam3/access-scasd-noloop/hunter.nasm
+++ b/exam3/access-scasd-noloop/hunter.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: hunter.nasm *access-scasd +noloop modification
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ;
diff --git a/exam3/access-scasd-noloop/payload.nasm b/exam3/access-scasd-noloop/payload.nasm
index 1ab23b8..9d8020d 100644
--- a/exam3/access-scasd-noloop/payload.nasm
+++ b/exam3/access-scasd-noloop/payload.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: payload-execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start
diff --git a/exam3/access-scasd/hunter.nasm b/exam3/access-scasd/hunter.nasm
index 5017a13..b0b9829 100644
--- a/exam3/access-scasd/hunter.nasm
+++ b/exam3/access-scasd/hunter.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: hunter.nasm *access-scasd modification
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ;
diff --git a/exam3/access-scasd/payload.nasm b/exam3/access-scasd/payload.nasm
index 1ab23b8..9d8020d 100644
--- a/exam3/access-scasd/payload.nasm
+++ b/exam3/access-scasd/payload.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: payload-execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start
diff --git a/exam3/access/hunter.nasm b/exam3/access/hunter.nasm
index cd9c50d..0f4607a 100644
--- a/exam3/access/hunter.nasm
+++ b/exam3/access/hunter.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: hunter.nasm *access modification
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ;
diff --git a/exam3/access/payload.nasm b/exam3/access/payload.nasm
index 1ab23b8..9d8020d 100644
--- a/exam3/access/payload.nasm
+++ b/exam3/access/payload.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: payload-execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start
diff --git a/exam3/basic/hunter.nasm b/exam3/basic/hunter.nasm
index da46f05..9a66bb4 100644
--- a/exam3/basic/hunter.nasm
+++ b/exam3/basic/hunter.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: hunter.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 ;
 ;
diff --git a/exam3/basic/payload.nasm b/exam3/basic/payload.nasm
index 1ab23b8..9d8020d 100644
--- a/exam3/basic/payload.nasm
+++ b/exam3/basic/payload.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: payload-execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start
diff --git a/exam4/decoder.nasm b/exam4/decoder.nasm
index 6baa47b..ad6b0af 100644
--- a/exam4/decoder.nasm
+++ b/exam4/decoder.nasm
@@ -13,7 +13,7 @@
 ;
 ;
 ; Filename: decoder.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 April
 ;
 ;
diff --git a/exam4/execve-stack.nasm b/exam4/execve-stack.nasm
index 77df821..cbcf101 100644
--- a/exam4/execve-stack.nasm
+++ b/exam4/execve-stack.nasm
@@ -12,7 +12,7 @@
 ;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ; Filename: execve-stack.nasm
-; Author: Andrey Arapov <andrey.arapov@gmail.com>
+; Author: Andrey Arapov <arno@nixaid.com>
 ; 2013 March
 
 global _start