diff --git a/LICENSE b/LICENSE
index 8541578..2e420b2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Benjamin Hepp
+Copyright (c) 2016 Benjamin Hepp and Tobias Naegeli.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 4983bd4..0cf92e8 100644
--- a/README.md
+++ b/README.md
@@ -36,3 +36,8 @@ A motion-capture system is useful for generating the calibration data but it cou
 measured by hand. The file _calibrate_example.m_ in the _utils_ folder shows how the data for _calibrate.m_ can be generated from motion-capture data.
 
 __Note__: When recording data for calibration make sure to use the uncalibrated measurements from the _uwb_multi_range_ node (otherwise you might use already calibrated values and get a wrong calibration).
+
+## Contact Information
+
+Benjamin Hepp <benjamin.hepp@inf.ethz.ch>
+Tobias Naegeli <tobias.naegeli@inf.ethz.ch>
diff --git a/src/UWBSerial.cpp b/src/UWBSerial.cpp
index 4b5e7d0..17b9b09 100644
--- a/src/UWBSerial.cpp
+++ b/src/UWBSerial.cpp
@@ -2,7 +2,7 @@
 // Serial reader for multiple UWB ranging units.
 //
 // Created by Benjamin Hepp on 02.04.16.
-// Copyright (c) 2016 Benjamin Hepp. All rights reserved.
+// Copyright (c) 2016 Benjamin Hepp.
 //
 
 #include "UWBSerial.h"
diff --git a/src/ait_link/Serial.cpp b/src/ait_link/Serial.cpp
index 629c9b4..6cb1716 100644
--- a/src/ait_link/Serial.cpp
+++ b/src/ait_link/Serial.cpp
@@ -2,7 +2,7 @@
 // Simple Serial Port class.
 //
 // Created by Benjamin Hepp on 02.04.16.
-// Copyright (c) 2016 Benjamin Hepp. All rights reserved.
+// Copyright (c) 2016 Benjamin Hepp.
 //
 
 #include "ait_link/Serial.h"
diff --git a/src/nodes/uwb_serial_node.cpp b/src/nodes/uwb_serial_node.cpp
index 7a11095..8609e4a 100644
--- a/src/nodes/uwb_serial_node.cpp
+++ b/src/nodes/uwb_serial_node.cpp
@@ -2,7 +2,7 @@
 // Node for reading UWB multi-ranges from serial port.
 //
 // Created by Benjamin Hepp on 02.04.16.
-// Copyright (c) 2016 Benjamin Hepp. All rights reserved.
+// Copyright (c) 2016 Benjamin Hepp.
 //
 
 
diff --git a/src/uwb_multi_range_node.py b/src/uwb_multi_range_node.py
index 47fc6c8..52a129a 100755
--- a/src/uwb_multi_range_node.py
+++ b/src/uwb_multi_range_node.py
@@ -5,8 +5,8 @@
 from __future__ import print_function
 
 __author__      = "Benjamin Hepp"
-__email__ = "benjamin.hepp@inf.ethz.ch"
-__copyright__   = "Copyright 2015 Benjamin Hepp"
+__email__       = "benjamin.hepp@inf.ethz.ch"
+__copyright__   = "Copyright 2016 Benjamin Hepp"
 
 import select
 import numpy as np
diff --git a/src/uwb_tracker_node.py b/src/uwb_tracker_node.py
index 0f6a49c..68b46e5 100755
--- a/src/uwb_tracker_node.py
+++ b/src/uwb_tracker_node.py
@@ -5,8 +5,8 @@
 from __future__ import print_function
 
 __author__      = "Benjamin Hepp"
-__email__ = "benjamin.hepp@inf.ethz.ch"
-__copyright__   = "Copyright 2015 Benjamin Hepp"
+__email__       = "benjamin.hepp@inf.ethz.ch"
+__copyright__   = "Copyright 2016 Benjamin Hepp"
 
 import select
 import numpy as np