Adapted copyright. Removed date (should be inserted dynamically at
checkin later). Introduced (optional) statistics.
diff --git a/vsomeip-daemon/include/daemon-config.h b/vsomeip-daemon/include/daemon-config.h
index 7d4dc2a..47adddf 100644
--- a/vsomeip-daemon/include/daemon-config.h
+++ b/vsomeip-daemon/include/daemon-config.h
@@ -1,12 +1,11 @@
 //
 // daemon-config.h
 //
-// Date: 	Oct 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-daemon/include/daemon.h b/vsomeip-daemon/include/daemon.h
index 756ae0b..6cdd175 100644
--- a/vsomeip-daemon/include/daemon.h
+++ b/vsomeip-daemon/include/daemon.h
@@ -1,12 +1,11 @@
 //
 // daemon.h
 //
-// Date: 	Oct 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-daemon/include/registration.h b/vsomeip-daemon/include/registration.h
index 728199e..76329c2 100644
--- a/vsomeip-daemon/include/registration.h
+++ b/vsomeip-daemon/include/registration.h
@@ -1,12 +1,11 @@
 //
 // registration.h
 //
-// Date: 	Nov 13, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-daemon/src/daemon/daemon.cpp b/vsomeip-daemon/src/daemon/daemon.cpp
index 0ace42f..81105a4 100644
--- a/vsomeip-daemon/src/daemon/daemon.cpp
+++ b/vsomeip-daemon/src/daemon/daemon.cpp
@@ -1,12 +1,11 @@
 //
 // daemon.cpp
 //
-// Date: 	Oct 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-daemon/src/daemon/main.cpp b/vsomeip-daemon/src/daemon/main.cpp
index 2d443f5..5be472d 100644
--- a/vsomeip-daemon/src/daemon/main.cpp
+++ b/vsomeip-daemon/src/daemon/main.cpp
@@ -1,12 +1,11 @@
 //
 // main.cpp
 //
-// Date: 	Oct 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-daemon/src/daemon/registration.cpp b/vsomeip-daemon/src/daemon/registration.cpp
index 472616f..1210047 100644
--- a/vsomeip-daemon/src/daemon/registration.cpp
+++ b/vsomeip-daemon/src/daemon/registration.cpp
@@ -1,12 +1,11 @@
 //
 // registration.cpp
 //
-// Date: 	Nov 13, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/configuration_option.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/configuration_option.hpp
index 9d25681..f38d1c4 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/configuration_option.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/configuration_option.hpp
@@ -1,12 +1,11 @@
 //
 // configuration_option.hpp
 //
-// Date: 	Oct 30, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/entry.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/entry.hpp
index 7bfe407..f4fc694 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/entry.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/entry.hpp
@@ -1,12 +1,11 @@
 //
 // entry.hpp
 //
-// Date: 	Oct 30, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/enumeration_types.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/enumeration_types.hpp
index 14af67a..01fa0ba 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/enumeration_types.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/enumeration_types.hpp
@@ -1,12 +1,11 @@
 //
 // enumeration_types.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/eventgroup_entry.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/eventgroup_entry.hpp
index bc55b99..9da61ec 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/eventgroup_entry.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/eventgroup_entry.hpp
@@ -1,12 +1,11 @@
 //
 // eventgroup_entry.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/factory.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/factory.hpp
index 83855df..05b0542 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/factory.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/factory.hpp
@@ -1,12 +1,11 @@
 //
 // factory.hpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/configuration_option_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/configuration_option_impl.hpp
index 2f52214..746a170 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/configuration_option_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/configuration_option_impl.hpp
@@ -1,12 +1,11 @@
 //
 // configuration_option_impl.hpp
 //
-// Date: 	Oct 30, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/deserializer_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/deserializer_impl.hpp
index 19d7b32..a1cb6a8 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/deserializer_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/deserializer_impl.hpp
@@ -1,12 +1,11 @@
 //
 // deserializer_impl.hpp
 //
-// Date: 	Jan 13, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/entry_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/entry_impl.hpp
index ab64d42..a3db62c 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/entry_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/entry_impl.hpp
@@ -1,12 +1,11 @@
 //
 // entry_impl.hpp
 //
-// Date: 	Oct 30, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #ifndef VSOMEIP_SERVICE_DISCOVERY_IMPL_ENTRY_IMPL_HPP
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/eventgroup_entry_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/eventgroup_entry_impl.hpp
index 5f5c4af..09b8c37 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/eventgroup_entry_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/eventgroup_entry_impl.hpp
@@ -1,12 +1,11 @@
 //
 // eventgroup_entry_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/factory_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/factory_impl.hpp
index aae714c..6ac1504 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/factory_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/factory_impl.hpp
@@ -1,12 +1,11 @@
 //
 // factory_impl.hpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #ifndef VSOMEIP_SERVICE_DISCOVERY_IMPL_FACTORYIMPL_HPP
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv4_endpoint_option_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv4_endpoint_option_impl.hpp
index 25b2c6f..5dda031 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv4_endpoint_option_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv4_endpoint_option_impl.hpp
@@ -1,12 +1,11 @@
 //
-// ipv4_endpoint_option_impl.h
+// ipv4_endpoint_option_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #ifndef VSOMEIP_SERVICE_DISCOVERY_IMPL_IPV4_ENDPOINT_OPTION_IMPL_HPP
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv6_endpoint_option_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv6_endpoint_option_impl.hpp
index e42f165..8cd6158 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv6_endpoint_option_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/ipv6_endpoint_option_impl.hpp
@@ -1,12 +1,11 @@
 //
 // ipv6_endpoint_option_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #ifndef VSOMEIP_SERVICE_DISCOVERY_IMPL_IPV6_ENDPOINT_OPTION_IMPL_HPP
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/load_balancing_option_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/load_balancing_option_impl.hpp
index bd1b498..7279c60 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/load_balancing_option_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/load_balancing_option_impl.hpp
@@ -1,12 +1,11 @@
 //
 // load_balancing_option_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_element_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_element_impl.hpp
index 08a78ea..fa6a9eb 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_element_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_element_impl.hpp
@@ -1,12 +1,11 @@
 //
 // message_element.hpp
 //
-// Date: 	Jan 10, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_impl.hpp
index 0cacaa3..1cca84c 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/message_impl.hpp
@@ -1,12 +1,11 @@
 //
 // message_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/option_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/option_impl.hpp
index 54439cd..d2f9b87 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/option_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/option_impl.hpp
@@ -1,12 +1,11 @@
 //
 // option_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #ifndef VSOMEIP_SERVICE_DISCOVERY_IMPL_OPTION_IMPL_HPP
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/protection_option_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/protection_option_impl.hpp
index f39cf38..d1d81f6 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/protection_option_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/protection_option_impl.hpp
@@ -1,12 +1,11 @@
 //
 // protection_option_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/service_entry_impl.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/service_entry_impl.hpp
index a7f6c35..e78a67b 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/service_entry_impl.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/impl/service_entry_impl.hpp
@@ -1,12 +1,11 @@
 //
 // service_entry_impl.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv4_endpoint_option.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv4_endpoint_option.hpp
index 7c8c5e7..e9d6c11 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv4_endpoint_option.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv4_endpoint_option.hpp
@@ -1,12 +1,11 @@
 //
 // ip4endpoint_option.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv6_endpoint_option.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv6_endpoint_option.hpp
index dfa7696..dd3b0a3 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv6_endpoint_option.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/ipv6_endpoint_option.hpp
@@ -1,12 +1,11 @@
 //
 // ipv6endpoint_option.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/load_balancing_option.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/load_balancing_option.hpp
index a02a011..4c9bfcb 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/load_balancing_option.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/load_balancing_option.hpp
@@ -1,12 +1,11 @@
 //
-// loadbalancingoption.hpp
+// load_balancing_option.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/message.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/message.hpp
index cfeaf50..24814b9 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/message.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/message.hpp
@@ -1,12 +1,11 @@
 //
 // message.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/option.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/option.hpp
index 637b761..d6b6767 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/option.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/option.hpp
@@ -1,12 +1,11 @@
 //
 // option.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/protection_option.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/protection_option.hpp
index 17f1172..f2ba2b1 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/protection_option.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/protection_option.hpp
@@ -1,12 +1,11 @@
 //
 // protection_option.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/include/vsomeip/service_discovery/service_entry.hpp b/vsomeip-service_discovery/include/vsomeip/service_discovery/service_entry.hpp
index da1dc8e..0ef7b1f 100644
--- a/vsomeip-service_discovery/include/vsomeip/service_discovery/service_entry.hpp
+++ b/vsomeip-service_discovery/include/vsomeip/service_discovery/service_entry.hpp
@@ -1,12 +1,11 @@
 //
-// service_entry.h
+// service_entry.hpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/factory.cpp b/vsomeip-service_discovery/src/service_discovery/factory.cpp
index a5fdf35..07636ed 100644
--- a/vsomeip-service_discovery/src/service_discovery/factory.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/factory.cpp
@@ -1,12 +1,11 @@
 //
 // factory.cpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/configuration_option_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/configuration_option_impl.cpp
index 9fcfe1e..e739cdf 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/configuration_option_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/configuration_option_impl.cpp
@@ -1,12 +1,11 @@
 //
 // configuration_option_impl.cpp
 //
-// Date: 	Oct 30, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <cstring>
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/deserializer_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/deserializer_impl.cpp
index 1bd7198..316dbb1 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/deserializer_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/deserializer_impl.cpp
@@ -1,12 +1,11 @@
 //
 // deserializer_impl.cpp
 //
-// Date: 	Jan 13, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/message_base.hpp>
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/entry_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/entry_impl.cpp
index c37fe9b..e1b2c6c 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/entry_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/entry_impl.cpp
@@ -1,12 +1,11 @@
 //
-// entryimpl.cpp
+// entry_impl.cpp
 //
-// Date: 	Oct 30, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/eventgroupentry_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/eventgroupentry_impl.cpp
index 9597a1f..b7d6d99 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/eventgroupentry_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/eventgroupentry_impl.cpp
@@ -1,12 +1,11 @@
 //
-// eventgroupentryimpl.cpp
+// eventgroup_entry_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/factory_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/factory_impl.cpp
index 8aacc57..053ae4d 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/factory_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/factory_impl.cpp
@@ -1,12 +1,11 @@
 //
 // factory_impl.cpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/service_discovery/impl/factory_impl.hpp>
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/ipv4_endpoint_option_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/ipv4_endpoint_option_impl.cpp
index e20d67e..4798b9c 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/ipv4_endpoint_option_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/ipv4_endpoint_option_impl.cpp
@@ -1,12 +1,11 @@
 //
-// ipv4endpointoption.cpp
+// ipv4_endpoint_option_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/ipv6_endpoint_option_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/ipv6_endpoint_option_impl.cpp
index fb77901..42bdd49 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/ipv6_endpoint_option_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/ipv6_endpoint_option_impl.cpp
@@ -1,12 +1,11 @@
 //
 // ipv6_endpoint_option_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <cstring>
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/load_balancing_option_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/load_balancing_option_impl.cpp
index 2c08d13..32314c7 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/load_balancing_option_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/load_balancing_option_impl.cpp
@@ -1,12 +1,11 @@
 //
-// loadbalancingoption.cpp
+// load_balancing_option.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/message_element_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/message_element_impl.cpp
index 0cd18e0..d90b957 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/message_element_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/message_element_impl.cpp
@@ -1,12 +1,11 @@
 //
 // message_element_impl.cpp
 //
-// Date: 	Jan 10, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/message_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/message_impl.cpp
index b40438b..c3bfe5b 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/message_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/message_impl.cpp
@@ -1,12 +1,11 @@
 //
 // message_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/config.hpp>
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/option_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/option_impl.cpp
index bf9d6a2..0bbcbcb 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/option_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/option_impl.cpp
@@ -1,12 +1,11 @@
 //
 // option_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/protection_option_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/protection_option_impl.cpp
index 9dcd078..b4ba1d8 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/protection_option_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/protection_option_impl.cpp
@@ -1,12 +1,11 @@
 //
 // protection_option_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-service_discovery/src/service_discovery/impl/service_entry_impl.cpp b/vsomeip-service_discovery/src/service_discovery/impl/service_entry_impl.cpp
index 3b4f77b..4f30325 100644
--- a/vsomeip-service_discovery/src/service_discovery/impl/service_entry_impl.cpp
+++ b/vsomeip-service_discovery/src/service_discovery/impl/service_entry_impl.cpp
@@ -1,12 +1,11 @@
 //
 // service_entry_impl.cpp
 //
-// Date: 	Oct 31, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip-test/src/serialization.cpp b/vsomeip-test/src/serialization.cpp
index 8a949a0..8232c30 100644
--- a/vsomeip-test/src/serialization.cpp
+++ b/vsomeip-test/src/serialization.cpp
@@ -1,12 +1,11 @@
 //
 // serialization.cpp
 //
-// Date: 	Nov 22, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/client.hpp b/vsomeip/include/vsomeip/client.hpp
index 4fc1698..fd2d307 100644
--- a/vsomeip/include/vsomeip/client.hpp
+++ b/vsomeip/include/vsomeip/client.hpp
@@ -1,12 +1,11 @@
 //
 // client.hpp
 //
-// Date: 	Jan 13, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/config.hpp b/vsomeip/include/vsomeip/config.hpp
index 6e0ac29..9e40f58 100644
--- a/vsomeip/include/vsomeip/config.hpp
+++ b/vsomeip/include/vsomeip/config.hpp
@@ -1,12 +1,11 @@
 //
 // config.hpp
 //
-// Date: 	Jan 10, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/deserializer.hpp b/vsomeip/include/vsomeip/deserializer.hpp
index 8e30d73..ef46e77 100644
--- a/vsomeip/include/vsomeip/deserializer.hpp
+++ b/vsomeip/include/vsomeip/deserializer.hpp
@@ -1,12 +1,11 @@
 //
 // deserializer.hpp
 //
-// Date: 	Jan 9, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/endpoint.hpp b/vsomeip/include/vsomeip/endpoint.hpp
index ae83585..bc83c91 100644
--- a/vsomeip/include/vsomeip/endpoint.hpp
+++ b/vsomeip/include/vsomeip/endpoint.hpp
@@ -1,12 +1,11 @@
 //
 // endpoint.hpp
 //
-// Date: 	Jan 13, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/enumeration_types.hpp b/vsomeip/include/vsomeip/enumeration_types.hpp
index 17b3407..09300b1 100644
--- a/vsomeip/include/vsomeip/enumeration_types.hpp
+++ b/vsomeip/include/vsomeip/enumeration_types.hpp
@@ -1,12 +1,11 @@
 //
 // enumeration_types.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/factory.hpp b/vsomeip/include/vsomeip/factory.hpp
index e76c969..e520c54 100644
--- a/vsomeip/include/vsomeip/factory.hpp
+++ b/vsomeip/include/vsomeip/factory.hpp
@@ -1,12 +1,11 @@
 //
 // factory.hpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/byteorder_impl.hpp b/vsomeip/include/vsomeip/impl/byteorder_impl.hpp
index caac3aa..cf3963a 100644
--- a/vsomeip/include/vsomeip/impl/byteorder_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/byteorder_impl.hpp
@@ -1,12 +1,11 @@
 //
 // byteorder.hpp
 //
-// Date: 	Nov 29, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/connection_impl.hpp b/vsomeip/include/vsomeip/impl/connection_impl.hpp
index d47cc2e..2dea222 100644
--- a/vsomeip/include/vsomeip/impl/connection_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/connection_impl.hpp
@@ -1,12 +1,11 @@
 //
 // connection_impl.hpp
 //
-// Date: 	Jan 14, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/constants_impl.hpp b/vsomeip/include/vsomeip/impl/constants_impl.hpp
index 2fd1bfb..b615878 100644
--- a/vsomeip/include/vsomeip/impl/constants_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/constants_impl.hpp
@@ -1,12 +1,11 @@
 //
 // constants_impl.hpp
 //
-// Date: 	Jan 13, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/deserializer_impl.hpp b/vsomeip/include/vsomeip/impl/deserializer_impl.hpp
index 3dd0f92..2d18a1c 100644
--- a/vsomeip/include/vsomeip/impl/deserializer_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/deserializer_impl.hpp
@@ -1,12 +1,11 @@
 //
 // deserializer_impl.hpp
 //
-// Date: 	Jan 9, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/endpoint_impl.hpp b/vsomeip/include/vsomeip/impl/endpoint_impl.hpp
index 52445df..05a242b 100644
--- a/vsomeip/include/vsomeip/impl/endpoint_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/endpoint_impl.hpp
@@ -1,12 +1,11 @@
 //
 // endpoint_impl.hpp
 //
-// Date: 	Jan 14, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/factory_impl.hpp b/vsomeip/include/vsomeip/impl/factory_impl.hpp
index 998fa2d..e365f9e 100644
--- a/vsomeip/include/vsomeip/impl/factory_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/factory_impl.hpp
@@ -1,12 +1,11 @@
 //
 // factory_impl.hpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/message_base_impl.hpp b/vsomeip/include/vsomeip/impl/message_base_impl.hpp
index daa0494..d3bd88a 100644
--- a/vsomeip/include/vsomeip/impl/message_base_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/message_base_impl.hpp
@@ -1,12 +1,11 @@
 //
 // message_base_impl.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/message_header_impl.hpp b/vsomeip/include/vsomeip/impl/message_header_impl.hpp
index fc41347..1241a6d 100644
--- a/vsomeip/include/vsomeip/impl/message_header_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/message_header_impl.hpp
@@ -1,12 +1,11 @@
 //
 // message_header_impl.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/message_impl.hpp b/vsomeip/include/vsomeip/impl/message_impl.hpp
index 723cb16..d229998 100644
--- a/vsomeip/include/vsomeip/impl/message_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/message_impl.hpp
@@ -1,12 +1,11 @@
 //
 // message_impl.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/payload_impl.hpp b/vsomeip/include/vsomeip/impl/payload_impl.hpp
index ddb410a..63520f9 100644
--- a/vsomeip/include/vsomeip/impl/payload_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/payload_impl.hpp
@@ -1,12 +1,11 @@
 //
 // payload_impl.hpp
 //
-// Date: 	Jan 9, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/send_buffer_impl.hpp b/vsomeip/include/vsomeip/impl/send_buffer_impl.hpp
index 76bdbb9..614a62f 100644
--- a/vsomeip/include/vsomeip/impl/send_buffer_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/send_buffer_impl.hpp
@@ -1,12 +1,11 @@
 //
 // send_buffer_impl.hpp
 //
-// Date: 	Jan 16, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/serializer_impl.hpp b/vsomeip/include/vsomeip/impl/serializer_impl.hpp
index 2f2f551..4dbadab 100644
--- a/vsomeip/include/vsomeip/impl/serializer_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/serializer_impl.hpp
@@ -1,12 +1,11 @@
 //
 // serializer_impl.hpp
 //
-// Date: 	Nov 29, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/statistics_impl.hpp b/vsomeip/include/vsomeip/impl/statistics_impl.hpp
new file mode 100644
index 0000000..5b6642c
--- /dev/null
+++ b/vsomeip/include/vsomeip/impl/statistics_impl.hpp
@@ -0,0 +1,36 @@
+//
+// statistics_impl.hpp
+//
+// Author: 	Lutz Bichler
+//
+// This file is part of the BMW Some/IP implementation.
+//
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
+// All rights reserved.
+//
+
+#ifndef VSOMEIP_IMPL_STATISTICS_IMPL_HPP
+#define VSOMEIP_IMPL_STATISTICS_IMPL_HPP
+
+#ifdef USE_VSOMEIP_STATISTICS
+
+#include <cstdint>
+#include <vsomeip/statistics.hpp>
+
+namespace vsomeip {
+
+class statistics_impl : public statistics {
+
+private:
+	uint32_t sent_messages_;
+	uint32_t sent_bytes_;
+
+	uint32_t received_messages_;
+	uint32_t received_bytes_;
+};
+
+} // namespace vsomeip
+
+#endif // USE_VSOMEIP_STATISTICS
+
+#endif // VSOMEIP_IMPL_STATISTICS_IMPL_HPP
diff --git a/vsomeip/include/vsomeip/impl/udp_client_impl.hpp b/vsomeip/include/vsomeip/impl/udp_client_impl.hpp
index c22f569..b3b5b9c 100644
--- a/vsomeip/include/vsomeip/impl/udp_client_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/udp_client_impl.hpp
@@ -1,12 +1,11 @@
 //
 // client_impl.hpp
 //
-// Date: 	Jan 14, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/impl/udp_service_impl.hpp b/vsomeip/include/vsomeip/impl/udp_service_impl.hpp
index 72a80a6..5d59e55 100644
--- a/vsomeip/include/vsomeip/impl/udp_service_impl.hpp
+++ b/vsomeip/include/vsomeip/impl/udp_service_impl.hpp
@@ -1,12 +1,11 @@
 //
 // udp_service_impl.hpp
 //
-// Date: 	Jan 15, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/message.hpp b/vsomeip/include/vsomeip/message.hpp
index 9b6da6d..54d2637 100644
--- a/vsomeip/include/vsomeip/message.hpp
+++ b/vsomeip/include/vsomeip/message.hpp
@@ -1,12 +1,11 @@
 //
 // message.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/message_base.hpp b/vsomeip/include/vsomeip/message_base.hpp
index f7182da..4b2e78f 100644
--- a/vsomeip/include/vsomeip/message_base.hpp
+++ b/vsomeip/include/vsomeip/message_base.hpp
@@ -1,12 +1,11 @@
 //
 // message_base.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/payload.hpp b/vsomeip/include/vsomeip/payload.hpp
index e73b530..2c79bf0 100644
--- a/vsomeip/include/vsomeip/payload.hpp
+++ b/vsomeip/include/vsomeip/payload.hpp
@@ -1,12 +1,11 @@
 //
 // payload.hpp
 //
-// Date: 	Jan 9, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/primitive_types.hpp b/vsomeip/include/vsomeip/primitive_types.hpp
index b7395bd..ccebf5b 100644
--- a/vsomeip/include/vsomeip/primitive_types.hpp
+++ b/vsomeip/include/vsomeip/primitive_types.hpp
@@ -1,12 +1,11 @@
 //
 // primitive_types.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/receiver.hpp b/vsomeip/include/vsomeip/receiver.hpp
index df1d4f8..4e777f7 100644
--- a/vsomeip/include/vsomeip/receiver.hpp
+++ b/vsomeip/include/vsomeip/receiver.hpp
@@ -1,12 +1,11 @@
 //
 // receiver.hpp
 //
-// Date: 	Jan 14, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/serializable.hpp b/vsomeip/include/vsomeip/serializable.hpp
index 4439ebb..4a60e01 100644
--- a/vsomeip/include/vsomeip/serializable.hpp
+++ b/vsomeip/include/vsomeip/serializable.hpp
@@ -1,12 +1,11 @@
 //
 // serializable.hpp
 //
-// Date: 	Jan 9, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/serializer.hpp b/vsomeip/include/vsomeip/serializer.hpp
index 347aa4e..386282c 100644
--- a/vsomeip/include/vsomeip/serializer.hpp
+++ b/vsomeip/include/vsomeip/serializer.hpp
@@ -1,12 +1,11 @@
 //
 // serializer.hpp
 //
-// Date: 	Nov 29, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/service.hpp b/vsomeip/include/vsomeip/service.hpp
index 736bb63..dcc9610 100644
--- a/vsomeip/include/vsomeip/service.hpp
+++ b/vsomeip/include/vsomeip/service.hpp
@@ -1,12 +1,11 @@
 //
 // service.hpp
 //
-// Date: 	Jan 15, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/include/vsomeip/statistics.hpp b/vsomeip/include/vsomeip/statistics.hpp
new file mode 100644
index 0000000..60403f2
--- /dev/null
+++ b/vsomeip/include/vsomeip/statistics.hpp
@@ -0,0 +1,30 @@
+//
+// statistics.hpp
+//
+// Author: 	Lutz Bichler
+//
+// This file is part of the BMW Some/IP implementation.
+//
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
+// All rights reserved.
+//
+
+#ifndef VSOMEIP_STATISTICS_HPP
+#define VSOMEIP_STATISTICS_HPP
+
+#ifdef USE_VSOMEIP_STATISTICS
+
+namespace vsomeip {
+
+class statistics {
+	virtual get_sent_messages_count() const;
+	virtual get_sent_bytes_count() const;
+	virtual get_received_messages_count() const;
+	virtual get_received_bytes_count() const;
+};
+
+} // namespace vsomeip
+
+#endif // USE_VSOMEIP_STATISTICS
+
+#endif // VSOMEIP_STATISTICS_HPP
diff --git a/vsomeip/include/vsomeip/vsomeip.hpp b/vsomeip/include/vsomeip/vsomeip.hpp
index 5a90fc3..9ab0e59 100644
--- a/vsomeip/include/vsomeip/vsomeip.hpp
+++ b/vsomeip/include/vsomeip/vsomeip.hpp
@@ -1,12 +1,11 @@
 //
 // vsomeip.hpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #ifndef VSOMEIP_HPP
diff --git a/vsomeip/src/impl/deserializer_impl.cpp b/vsomeip/src/impl/deserializer_impl.cpp
index 439a21a..7df85cc 100644
--- a/vsomeip/src/impl/deserializer_impl.cpp
+++ b/vsomeip/src/impl/deserializer_impl.cpp
@@ -1,12 +1,11 @@
 //
 // deserializer_impl.cpp
 //
-// Date: 	Nov 14, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/src/impl/endpoint_impl.cpp b/vsomeip/src/impl/endpoint_impl.cpp
index 1d9664e..4722dd0 100644
--- a/vsomeip/src/impl/endpoint_impl.cpp
+++ b/vsomeip/src/impl/endpoint_impl.cpp
@@ -1,12 +1,11 @@
 //
 // endpoint_impl.cpp
 //
-// Date: 	Jan 14, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/src/impl/factory_impl.cpp b/vsomeip/src/impl/factory_impl.cpp
index 02579e9..57e2dce 100644
--- a/vsomeip/src/impl/factory_impl.cpp
+++ b/vsomeip/src/impl/factory_impl.cpp
@@ -1,12 +1,11 @@
 //
 // factory_impl.cpp
 //
-// Date: 	Nov 18, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/impl/factory_impl.hpp>
diff --git a/vsomeip/src/impl/message_base_impl.cpp b/vsomeip/src/impl/message_base_impl.cpp
index ff82b58..fdd96f3 100644
--- a/vsomeip/src/impl/message_base_impl.cpp
+++ b/vsomeip/src/impl/message_base_impl.cpp
@@ -1,12 +1,11 @@
 //
 // message_base_impl.cpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/impl/byteorder_impl.hpp>
diff --git a/vsomeip/src/impl/message_header_impl.cpp b/vsomeip/src/impl/message_header_impl.cpp
index a2249bb..e2a2c33 100644
--- a/vsomeip/src/impl/message_header_impl.cpp
+++ b/vsomeip/src/impl/message_header_impl.cpp
@@ -1,12 +1,11 @@
 //
 // message_header_impl.cpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
diff --git a/vsomeip/src/impl/message_impl.cpp b/vsomeip/src/impl/message_impl.cpp
index 7cd296b..e44613e 100644
--- a/vsomeip/src/impl/message_impl.cpp
+++ b/vsomeip/src/impl/message_impl.cpp
@@ -1,12 +1,11 @@
 //
 // message_impl.cpp
 //
-// Date: 	Nov 28, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/impl/byteorder_impl.hpp>
diff --git a/vsomeip/src/impl/payload_impl.cpp b/vsomeip/src/impl/payload_impl.cpp
index 92e4c37..aac87dc 100644
--- a/vsomeip/src/impl/payload_impl.cpp
+++ b/vsomeip/src/impl/payload_impl.cpp
@@ -1,12 +1,11 @@
 //
 // payload_impl.cpp
 //
-// Date: 	Jan 9, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <vsomeip/serializer.hpp>
diff --git a/vsomeip/src/impl/serializer_impl.cpp b/vsomeip/src/impl/serializer_impl.cpp
index 6ac414d..ac9fc33 100644
--- a/vsomeip/src/impl/serializer_impl.cpp
+++ b/vsomeip/src/impl/serializer_impl.cpp
@@ -1,12 +1,11 @@
 //
 // serializer_impl.cpp
 //
-// Date: 	Nov 29, 2013
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <cstring>
diff --git a/vsomeip/src/impl/statistics_impl.cpp b/vsomeip/src/impl/statistics_impl.cpp
new file mode 100644
index 0000000..f5f1bd6
--- /dev/null
+++ b/vsomeip/src/impl/statistics_impl.cpp
@@ -0,0 +1,16 @@
+//
+// statistics_impl.cpp
+//
+// Author: 	Lutz Bichler
+//
+// This file is part of the BMW Some/IP implementation.
+//
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
+// All rights reserved.
+//
+#ifdef USE_VSOMEIP_STATISTICS
+
+#include <vsomeip/impl/statistics_impl.hpp>
+
+
+#endif // USE_VSOMEIP_STATISTICS
diff --git a/vsomeip/src/impl/udp_client_impl.cpp b/vsomeip/src/impl/udp_client_impl.cpp
index 7be76a5..8973a6a 100644
--- a/vsomeip/src/impl/udp_client_impl.cpp
+++ b/vsomeip/src/impl/udp_client_impl.cpp
@@ -1,12 +1,11 @@
 //
 // udp_client_impl.cpp
 //
-// Date: 	Jan 14, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 #include <boost/bind.hpp>
@@ -147,6 +146,11 @@
 
 }
 
+#ifdef USE_VSOMEIP_STATISTICS
+statistics udp_client_impl::get_statistics() const {
+	return statistics;
+}
+#endif
 
 } // namespace vsomeip
 
diff --git a/vsomeip/src/impl/udp_service_impl.cpp b/vsomeip/src/impl/udp_service_impl.cpp
index 14e695e..c4b745f 100644
--- a/vsomeip/src/impl/udp_service_impl.cpp
+++ b/vsomeip/src/impl/udp_service_impl.cpp
@@ -1,12 +1,11 @@
 //
 // udp_service_impl.cpp
 //
-// Date: 	Jan 15, 2014
 // Author: 	Lutz Bichler
 //
 // This file is part of the BMW Some/IP implementation.
 //
-// Copyright © 2013 Bayerische Motoren Werke AG (BMW). 
+// Copyright © 2013, 2014 Bayerische Motoren Werke AG (BMW).
 // All rights reserved.
 //
 
@@ -63,8 +62,8 @@
 void udp_service_impl::receive_callback(boost::system::error_code const &error, std::size_t transferred_bytes) {
 	if (!error || error == boost::asio::error::message_size) {
 		std::cout << "Received(" << std::dec << (int)transferred_bytes << "): ";
-		for (std::size_t i = 0; i < transferred_bytes; ++i)
-			std::cout << std::hex << std::setw(2) << std::setfill('0') << (int)buffer_[i] << " ";
+		//for (std::size_t i = 0; i < transferred_bytes; ++i)
+		//	std::cout << std::hex << std::setw(2) << std::setfill('0') << (int)buffer_[i] << " ";
 		std::cout << std::endl;
 		start();
 	}