Copyright transfer from 250bpm s.r.o. to Martin Sustrik

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e3a833..b967c5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+#   Copyright (c) 2012 Martin Sustrik  All rights reserved.
 #   Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/COPYING b/COPYING
index 571bce7..4efdba9 100644
--- a/COPYING
+++ b/COPYING
@@ -17,5 +17,5 @@
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 
-"nanomsg" is a trademark of 250bpm s.r.o.
+"nanomsg" is a trademark of Martin Sustrik
 
diff --git a/perf/inproc_lat.c b/perf/inproc_lat.c
index a7dfdeb..dac16ed 100644
--- a/perf/inproc_lat.c
+++ b/perf/inproc_lat.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/perf/inproc_thr.c b/perf/inproc_thr.c
index 7100293..4a04d96 100644
--- a/perf/inproc_thr.c
+++ b/perf/inproc_thr.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/perf/local_lat.c b/perf/local_lat.c
index 261065f..3d7e973 100644
--- a/perf/local_lat.c
+++ b/perf/local_lat.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/perf/local_thr.c b/perf/local_thr.c
index 1ea27fb..b8ba1f6 100644
--- a/perf/local_thr.c
+++ b/perf/local_thr.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/perf/remote_lat.c b/perf/remote_lat.c
index 6f4aed3..400468a 100644
--- a/perf/remote_lat.c
+++ b/perf/remote_lat.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/perf/remote_thr.c b/perf/remote_thr.c
index c023c43..3b8f60c 100644
--- a/perf/remote_thr.c
+++ b/perf/remote_thr.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d1ed548..ad53989 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#   Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+#   Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 #   Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/ctx.c b/src/aio/ctx.c
index e2efb0f..f6ea105 100644
--- a/src/aio/ctx.c
+++ b/src/aio/ctx.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/ctx.h b/src/aio/ctx.h
index f63ad70..2ad570f 100644
--- a/src/aio/ctx.h
+++ b/src/aio/ctx.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/fsm.c b/src/aio/fsm.c
index 1aad0bf..a3fceae 100644
--- a/src/aio/fsm.c
+++ b/src/aio/fsm.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/fsm.h b/src/aio/fsm.h
index e19f8fa..19eca1a 100644
--- a/src/aio/fsm.h
+++ b/src/aio/fsm.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller.c b/src/aio/poller.c
index bf27885..86c54b4 100644
--- a/src/aio/poller.c
+++ b/src/aio/poller.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller.h b/src/aio/poller.h
index 7c526d2..890f137 100644
--- a/src/aio/poller.h
+++ b/src/aio/poller.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller_epoll.h b/src/aio/poller_epoll.h
index efa4446..f122cf1 100644
--- a/src/aio/poller_epoll.h
+++ b/src/aio/poller_epoll.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller_epoll.inc b/src/aio/poller_epoll.inc
index de89958..40f9f57 100644
--- a/src/aio/poller_epoll.inc
+++ b/src/aio/poller_epoll.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller_kqueue.h b/src/aio/poller_kqueue.h
index ada0f13..62eb33c 100644
--- a/src/aio/poller_kqueue.h
+++ b/src/aio/poller_kqueue.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller_kqueue.inc b/src/aio/poller_kqueue.inc
index e0a21af..194e77f 100644
--- a/src/aio/poller_kqueue.inc
+++ b/src/aio/poller_kqueue.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller_poll.h b/src/aio/poller_poll.h
index 3754d2c..31fcadb 100644
--- a/src/aio/poller_poll.h
+++ b/src/aio/poller_poll.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/poller_poll.inc b/src/aio/poller_poll.inc
index 7ca1095..58eb4c4 100644
--- a/src/aio/poller_poll.inc
+++ b/src/aio/poller_poll.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/pool.c b/src/aio/pool.c
index f507ad0..0fe1db2 100644
--- a/src/aio/pool.c
+++ b/src/aio/pool.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/pool.h b/src/aio/pool.h
index 267c465..c5b33e6 100644
--- a/src/aio/pool.h
+++ b/src/aio/pool.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/timer.c b/src/aio/timer.c
index 0416c9c..73ba604 100644
--- a/src/aio/timer.c
+++ b/src/aio/timer.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/timer.h b/src/aio/timer.h
index df4225d..52ad3aa 100644
--- a/src/aio/timer.h
+++ b/src/aio/timer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/timerset.c b/src/aio/timerset.c
index afe4c0f..9f7384e 100644
--- a/src/aio/timerset.c
+++ b/src/aio/timerset.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/timerset.h b/src/aio/timerset.h
index f0e2035..3e4dc1e 100644
--- a/src/aio/timerset.h
+++ b/src/aio/timerset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/usock.c b/src/aio/usock.c
index bc82bf6..ed78062 100644
--- a/src/aio/usock.c
+++ b/src/aio/usock.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/usock.h b/src/aio/usock.h
index 1a75347..fad0591 100644
--- a/src/aio/usock.h
+++ b/src/aio/usock.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/usock_posix.h b/src/aio/usock_posix.h
index 5d261ef..ee23501 100644
--- a/src/aio/usock_posix.h
+++ b/src/aio/usock_posix.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/usock_posix.inc b/src/aio/usock_posix.inc
index 40fecd2..0ca3a67 100644
--- a/src/aio/usock_posix.inc
+++ b/src/aio/usock_posix.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/usock_win.h b/src/aio/usock_win.h
index 22c8308..615831b 100644
--- a/src/aio/usock_win.h
+++ b/src/aio/usock_win.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/usock_win.inc b/src/aio/usock_win.inc
index e3fa31e..4704f6d 100644
--- a/src/aio/usock_win.inc
+++ b/src/aio/usock_win.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/worker.c b/src/aio/worker.c
index 0eebf16..1619657 100644
--- a/src/aio/worker.c
+++ b/src/aio/worker.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/worker.h b/src/aio/worker.h
index 5b24c3c..f49ec48 100644
--- a/src/aio/worker.h
+++ b/src/aio/worker.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/worker_posix.h b/src/aio/worker_posix.h
index 2ac7375..4214abb 100644
--- a/src/aio/worker_posix.h
+++ b/src/aio/worker_posix.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/worker_posix.inc b/src/aio/worker_posix.inc
index 9a3527d..169796c 100644
--- a/src/aio/worker_posix.inc
+++ b/src/aio/worker_posix.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/aio/worker_win.h b/src/aio/worker_win.h
index b8ad11d..1b1dac0 100644
--- a/src/aio/worker_win.h
+++ b/src/aio/worker_win.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/aio/worker_win.inc b/src/aio/worker_win.inc
index 4e94f8c..7a25bb9 100644
--- a/src/aio/worker_win.inc
+++ b/src/aio/worker_win.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/bus.h b/src/bus.h
index aebd41d..7572903 100644
--- a/src/bus.h
+++ b/src/bus.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/ep.c b/src/core/ep.c
index d005be3..94b5f5e 100644
--- a/src/core/ep.c
+++ b/src/core/ep.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/core/ep.h b/src/core/ep.h
index f91e94c..d32c23b 100644
--- a/src/core/ep.h
+++ b/src/core/ep.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/epbase.c b/src/core/epbase.c
index 8d947eb..28e0905 100644
--- a/src/core/epbase.c
+++ b/src/core/epbase.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/global.c b/src/core/global.c
index 78d2e49..1d70aee 100644
--- a/src/core/global.c
+++ b/src/core/global.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/core/global.h b/src/core/global.h
index f5272e8..53e9d25 100644
--- a/src/core/global.h
+++ b/src/core/global.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/pipe.c b/src/core/pipe.c
index eae1824..56d2d6e 100644
--- a/src/core/pipe.c
+++ b/src/core/pipe.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/poll.c b/src/core/poll.c
index cafd190..cb61ddf 100644
--- a/src/core/poll.c
+++ b/src/core/poll.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/sock.c b/src/core/sock.c
index fd4973c..c248a42 100644
--- a/src/core/sock.c
+++ b/src/core/sock.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/core/sock.h b/src/core/sock.h
index c62f103..9c86b19 100644
--- a/src/core/sock.h
+++ b/src/core/sock.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/core/sockbase.c b/src/core/sockbase.c
index b0140dc..ce179da 100644
--- a/src/core/sockbase.c
+++ b/src/core/sockbase.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/devices/device.c b/src/devices/device.c
index e54eb33..c82ef0c 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/inproc.h b/src/inproc.h
index f126519..ed38799 100644
--- a/src/inproc.h
+++ b/src/inproc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/ipc.h b/src/ipc.h
index 91d36bc..fc5cb62 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/nn.h b/src/nn.h
index 7a6e70a..a0b6a08 100644
--- a/src/nn.h
+++ b/src/nn.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/pair.h b/src/pair.h
index 7d80948..3409418 100644
--- a/src/pair.h
+++ b/src/pair.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/pipeline.h b/src/pipeline.h
index 69e8394..db9b7d7 100644
--- a/src/pipeline.h
+++ b/src/pipeline.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/protocol.h b/src/protocol.h
index 38db31f..05664e4 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/bus/bus.c b/src/protocols/bus/bus.c
index 6eba813..3064fa8 100644
--- a/src/protocols/bus/bus.c
+++ b/src/protocols/bus/bus.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/bus/bus.h b/src/protocols/bus/bus.h
index 607cffe..4390ace 100644
--- a/src/protocols/bus/bus.h
+++ b/src/protocols/bus/bus.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/bus/xbus.c b/src/protocols/bus/xbus.c
index fb48f2e..4cdc3a3 100644
--- a/src/protocols/bus/xbus.c
+++ b/src/protocols/bus/xbus.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013-2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/bus/xbus.h b/src/protocols/bus/xbus.h
index b1fe3b7..bdf04f8 100644
--- a/src/protocols/bus/xbus.h
+++ b/src/protocols/bus/xbus.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pair/pair.c b/src/protocols/pair/pair.c
index e7530e8..4cbb3fb 100644
--- a/src/protocols/pair/pair.c
+++ b/src/protocols/pair/pair.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pair/pair.h b/src/protocols/pair/pair.h
index 0a0346a..b33ab48 100644
--- a/src/protocols/pair/pair.h
+++ b/src/protocols/pair/pair.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pair/xpair.c b/src/protocols/pair/xpair.c
index 8e5789b..ab925a1 100644
--- a/src/protocols/pair/xpair.c
+++ b/src/protocols/pair/xpair.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pair/xpair.h b/src/protocols/pair/xpair.h
index 4f496fb..a0738b3 100644
--- a/src/protocols/pair/xpair.h
+++ b/src/protocols/pair/xpair.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/pull.c b/src/protocols/pipeline/pull.c
index 5468001..ec9f1d6 100644
--- a/src/protocols/pipeline/pull.c
+++ b/src/protocols/pipeline/pull.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/pull.h b/src/protocols/pipeline/pull.h
index 96ac5b8..592e6cf 100644
--- a/src/protocols/pipeline/pull.h
+++ b/src/protocols/pipeline/pull.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/push.c b/src/protocols/pipeline/push.c
index f0803d9..061f07e 100644
--- a/src/protocols/pipeline/push.c
+++ b/src/protocols/pipeline/push.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/push.h b/src/protocols/pipeline/push.h
index c892469..e0bb6a5 100644
--- a/src/protocols/pipeline/push.h
+++ b/src/protocols/pipeline/push.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/xpull.c b/src/protocols/pipeline/xpull.c
index afb6dae..673accd 100644
--- a/src/protocols/pipeline/xpull.c
+++ b/src/protocols/pipeline/xpull.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/protocols/pipeline/xpull.h b/src/protocols/pipeline/xpull.h
index a1ae5cb..37ef9a4 100644
--- a/src/protocols/pipeline/xpull.h
+++ b/src/protocols/pipeline/xpull.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/xpush.c b/src/protocols/pipeline/xpush.c
index ad45fce..2d938bd 100644
--- a/src/protocols/pipeline/xpush.c
+++ b/src/protocols/pipeline/xpush.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pipeline/xpush.h b/src/protocols/pipeline/xpush.h
index 45ebf69..f7c7e60 100644
--- a/src/protocols/pipeline/xpush.h
+++ b/src/protocols/pipeline/xpush.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/pub.c b/src/protocols/pubsub/pub.c
index bc20a3d..44f9899 100644
--- a/src/protocols/pubsub/pub.c
+++ b/src/protocols/pubsub/pub.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/pub.h b/src/protocols/pubsub/pub.h
index 4f480f8..366ada8 100644
--- a/src/protocols/pubsub/pub.h
+++ b/src/protocols/pubsub/pub.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/sub.c b/src/protocols/pubsub/sub.c
index bf44629..789dc76 100644
--- a/src/protocols/pubsub/sub.c
+++ b/src/protocols/pubsub/sub.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/sub.h b/src/protocols/pubsub/sub.h
index 4a2ce35..300c0ab 100644
--- a/src/protocols/pubsub/sub.h
+++ b/src/protocols/pubsub/sub.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/trie.c b/src/protocols/pubsub/trie.c
index f185f2b..847404c 100644
--- a/src/protocols/pubsub/trie.c
+++ b/src/protocols/pubsub/trie.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/trie.h b/src/protocols/pubsub/trie.h
index 091c109..78693a8 100644
--- a/src/protocols/pubsub/trie.h
+++ b/src/protocols/pubsub/trie.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/xpub.c b/src/protocols/pubsub/xpub.c
index 7cde83d..de108ea 100644
--- a/src/protocols/pubsub/xpub.c
+++ b/src/protocols/pubsub/xpub.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/xpub.h b/src/protocols/pubsub/xpub.h
index 2289a12..59009a3 100644
--- a/src/protocols/pubsub/xpub.h
+++ b/src/protocols/pubsub/xpub.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/pubsub/xsub.c b/src/protocols/pubsub/xsub.c
index 756b172..e7b2646 100644
--- a/src/protocols/pubsub/xsub.c
+++ b/src/protocols/pubsub/xsub.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/protocols/pubsub/xsub.h b/src/protocols/pubsub/xsub.h
index 98b09a9..1d42692 100644
--- a/src/protocols/pubsub/xsub.h
+++ b/src/protocols/pubsub/xsub.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/rep.c b/src/protocols/reqrep/rep.c
index 0498a41..282d9f9 100644
--- a/src/protocols/reqrep/rep.c
+++ b/src/protocols/reqrep/rep.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/rep.h b/src/protocols/reqrep/rep.h
index d7007b1..0f78b39 100644
--- a/src/protocols/reqrep/rep.h
+++ b/src/protocols/reqrep/rep.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/req.c b/src/protocols/reqrep/req.c
index 049390f..27be656 100644
--- a/src/protocols/reqrep/req.c
+++ b/src/protocols/reqrep/req.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/req.h b/src/protocols/reqrep/req.h
index 468b314..6669244 100644
--- a/src/protocols/reqrep/req.h
+++ b/src/protocols/reqrep/req.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/task.c b/src/protocols/reqrep/task.c
index 491dd48..bbf6a04 100644
--- a/src/protocols/reqrep/task.c
+++ b/src/protocols/reqrep/task.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/task.h b/src/protocols/reqrep/task.h
index e546726..159e468 100644
--- a/src/protocols/reqrep/task.h
+++ b/src/protocols/reqrep/task.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/xrep.c b/src/protocols/reqrep/xrep.c
index 8f98ac0..e289b34 100644
--- a/src/protocols/reqrep/xrep.c
+++ b/src/protocols/reqrep/xrep.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/xrep.h b/src/protocols/reqrep/xrep.h
index 1afab0d..036362c 100644
--- a/src/protocols/reqrep/xrep.h
+++ b/src/protocols/reqrep/xrep.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/xreq.c b/src/protocols/reqrep/xreq.c
index f39ae33..392382f 100644
--- a/src/protocols/reqrep/xreq.c
+++ b/src/protocols/reqrep/xreq.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/reqrep/xreq.h b/src/protocols/reqrep/xreq.h
index 441bea1..56497dc 100644
--- a/src/protocols/reqrep/xreq.h
+++ b/src/protocols/reqrep/xreq.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/respondent.c b/src/protocols/survey/respondent.c
index 299adf1..e454db8 100644
--- a/src/protocols/survey/respondent.c
+++ b/src/protocols/survey/respondent.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/respondent.h b/src/protocols/survey/respondent.h
index f41dbe1..aabf72f 100644
--- a/src/protocols/survey/respondent.h
+++ b/src/protocols/survey/respondent.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/surveyor.c b/src/protocols/survey/surveyor.c
index cfb5465..ed03303 100644
--- a/src/protocols/survey/surveyor.c
+++ b/src/protocols/survey/surveyor.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/surveyor.h b/src/protocols/survey/surveyor.h
index a13dbe0..b4bf514 100644
--- a/src/protocols/survey/surveyor.h
+++ b/src/protocols/survey/surveyor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/xrespondent.c b/src/protocols/survey/xrespondent.c
index e7ef175..2bb607f 100644
--- a/src/protocols/survey/xrespondent.c
+++ b/src/protocols/survey/xrespondent.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/xrespondent.h b/src/protocols/survey/xrespondent.h
index f72f8ee..b9bcb45 100644
--- a/src/protocols/survey/xrespondent.h
+++ b/src/protocols/survey/xrespondent.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 201-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 201-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/xsurveyor.c b/src/protocols/survey/xsurveyor.c
index 3507f02..c2e5c9c 100644
--- a/src/protocols/survey/xsurveyor.c
+++ b/src/protocols/survey/xsurveyor.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/survey/xsurveyor.h b/src/protocols/survey/xsurveyor.h
index 64477bd..fe7f8b4 100644
--- a/src/protocols/survey/xsurveyor.h
+++ b/src/protocols/survey/xsurveyor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/dist.c b/src/protocols/utils/dist.c
index ce11e36..51ebe11 100644
--- a/src/protocols/utils/dist.c
+++ b/src/protocols/utils/dist.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/dist.h b/src/protocols/utils/dist.h
index b389da3..403a915 100644
--- a/src/protocols/utils/dist.h
+++ b/src/protocols/utils/dist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/excl.c b/src/protocols/utils/excl.c
index 9c278a8..73886a1 100644
--- a/src/protocols/utils/excl.c
+++ b/src/protocols/utils/excl.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/excl.h b/src/protocols/utils/excl.h
index 6c6affe..f2d15cd 100644
--- a/src/protocols/utils/excl.h
+++ b/src/protocols/utils/excl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/fq.c b/src/protocols/utils/fq.c
index 7c40282..3e91c32 100644
--- a/src/protocols/utils/fq.c
+++ b/src/protocols/utils/fq.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/fq.h b/src/protocols/utils/fq.h
index 22b32af..fd9305b 100644
--- a/src/protocols/utils/fq.h
+++ b/src/protocols/utils/fq.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/lb.c b/src/protocols/utils/lb.c
index 3b62fa2..5b68dc9 100644
--- a/src/protocols/utils/lb.c
+++ b/src/protocols/utils/lb.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/lb.h b/src/protocols/utils/lb.h
index 5f6d744..1fc018a 100644
--- a/src/protocols/utils/lb.h
+++ b/src/protocols/utils/lb.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/protocols/utils/priolist.c b/src/protocols/utils/priolist.c
index bb6f039..8d89658 100644
--- a/src/protocols/utils/priolist.c
+++ b/src/protocols/utils/priolist.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/protocols/utils/priolist.h b/src/protocols/utils/priolist.h
index 260202d..a68491c 100644
--- a/src/protocols/utils/priolist.h
+++ b/src/protocols/utils/priolist.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/pubsub.h b/src/pubsub.h
index f472b64..04abb4f 100644
--- a/src/pubsub.h
+++ b/src/pubsub.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/reqrep.h b/src/reqrep.h
index 0a17067..b50e61b 100644
--- a/src/reqrep.h
+++ b/src/reqrep.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/survey.h b/src/survey.h
index 10b98ef..b1fd03d 100644
--- a/src/survey.h
+++ b/src/survey.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/tcp.h b/src/tcp.h
index dcc7174..1d90776 100644
--- a/src/tcp.h
+++ b/src/tcp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transport.h b/src/transport.h
index fddc4bf..50d9160 100644
--- a/src/transport.h
+++ b/src/transport.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/inproc/binproc.c b/src/transports/inproc/binproc.c
index 0cfed2f..890854b 100644
--- a/src/transports/inproc/binproc.c
+++ b/src/transports/inproc/binproc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/inproc/binproc.h b/src/transports/inproc/binproc.h
index 56be5b9..4516bfa 100644
--- a/src/transports/inproc/binproc.h
+++ b/src/transports/inproc/binproc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/cinproc.c b/src/transports/inproc/cinproc.c
index f065cb1..fe5ac2e 100644
--- a/src/transports/inproc/cinproc.c
+++ b/src/transports/inproc/cinproc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/inproc/cinproc.h b/src/transports/inproc/cinproc.h
index da61a9c..bccaed0 100644
--- a/src/transports/inproc/cinproc.h
+++ b/src/transports/inproc/cinproc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/inproc.c b/src/transports/inproc/inproc.c
index 3dbe5a5..9f994f5 100644
--- a/src/transports/inproc/inproc.c
+++ b/src/transports/inproc/inproc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/inproc/inproc.h b/src/transports/inproc/inproc.h
index f1189f8..0486dff 100644
--- a/src/transports/inproc/inproc.h
+++ b/src/transports/inproc/inproc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/ins.c b/src/transports/inproc/ins.c
index 74b9655..3746cd6 100644
--- a/src/transports/inproc/ins.c
+++ b/src/transports/inproc/ins.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/inproc/ins.h b/src/transports/inproc/ins.h
index 87b2ec4..e16bd8d 100644
--- a/src/transports/inproc/ins.h
+++ b/src/transports/inproc/ins.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/msgqueue.c b/src/transports/inproc/msgqueue.c
index ad525cd..a55c8ef 100644
--- a/src/transports/inproc/msgqueue.c
+++ b/src/transports/inproc/msgqueue.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/msgqueue.h b/src/transports/inproc/msgqueue.h
index 530406c..9b2d9ca 100644
--- a/src/transports/inproc/msgqueue.h
+++ b/src/transports/inproc/msgqueue.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/sinproc.c b/src/transports/inproc/sinproc.c
index 712daec..dd79a78 100644
--- a/src/transports/inproc/sinproc.c
+++ b/src/transports/inproc/sinproc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/inproc/sinproc.h b/src/transports/inproc/sinproc.h
index a62656a..07b51ad 100644
--- a/src/transports/inproc/sinproc.h
+++ b/src/transports/inproc/sinproc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/aipc.c b/src/transports/ipc/aipc.c
index cc1c028..81e0b35 100644
--- a/src/transports/ipc/aipc.c
+++ b/src/transports/ipc/aipc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/aipc.h b/src/transports/ipc/aipc.h
index 826bbcb..d0b57c8 100644
--- a/src/transports/ipc/aipc.h
+++ b/src/transports/ipc/aipc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/bipc.c b/src/transports/ipc/bipc.c
index 2379ab3..b89be42 100644
--- a/src/transports/ipc/bipc.c
+++ b/src/transports/ipc/bipc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/bipc.h b/src/transports/ipc/bipc.h
index ebf7135..ca43bd5 100644
--- a/src/transports/ipc/bipc.h
+++ b/src/transports/ipc/bipc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/cipc.c b/src/transports/ipc/cipc.c
index 28508df..c25847c 100644
--- a/src/transports/ipc/cipc.c
+++ b/src/transports/ipc/cipc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/cipc.h b/src/transports/ipc/cipc.h
index 0d48763..3d5b6d7 100644
--- a/src/transports/ipc/cipc.h
+++ b/src/transports/ipc/cipc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/ipc.c b/src/transports/ipc/ipc.c
index 552ba13..1c3012f 100644
--- a/src/transports/ipc/ipc.c
+++ b/src/transports/ipc/ipc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/ipc/ipc.h b/src/transports/ipc/ipc.h
index ea4cd28..8c52780 100644
--- a/src/transports/ipc/ipc.h
+++ b/src/transports/ipc/ipc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/sipc.c b/src/transports/ipc/sipc.c
index 73cfd2f..453b731 100644
--- a/src/transports/ipc/sipc.c
+++ b/src/transports/ipc/sipc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/ipc/sipc.h b/src/transports/ipc/sipc.h
index 4090e2d..eaf1e2b 100644
--- a/src/transports/ipc/sipc.h
+++ b/src/transports/ipc/sipc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/atcp.c b/src/transports/tcp/atcp.c
index c651e13..e94be8f 100644
--- a/src/transports/tcp/atcp.c
+++ b/src/transports/tcp/atcp.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/atcp.h b/src/transports/tcp/atcp.h
index 315173d..435d2a8 100644
--- a/src/transports/tcp/atcp.h
+++ b/src/transports/tcp/atcp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/btcp.c b/src/transports/tcp/btcp.c
index a021c12..1ac0e58 100644
--- a/src/transports/tcp/btcp.c
+++ b/src/transports/tcp/btcp.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/btcp.h b/src/transports/tcp/btcp.h
index 4c2b31a..30aca24 100644
--- a/src/transports/tcp/btcp.h
+++ b/src/transports/tcp/btcp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/ctcp.c b/src/transports/tcp/ctcp.c
index 0269494..1b8510d 100644
--- a/src/transports/tcp/ctcp.c
+++ b/src/transports/tcp/ctcp.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/ctcp.h b/src/transports/tcp/ctcp.h
index 466d68a..92b1694 100644
--- a/src/transports/tcp/ctcp.h
+++ b/src/transports/tcp/ctcp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/stcp.c b/src/transports/tcp/stcp.c
index 7f6342b..1dab3fc 100644
--- a/src/transports/tcp/stcp.c
+++ b/src/transports/tcp/stcp.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/stcp.h b/src/transports/tcp/stcp.h
index a158f03..d817807 100644
--- a/src/transports/tcp/stcp.h
+++ b/src/transports/tcp/stcp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/tcp/tcp.c b/src/transports/tcp/tcp.c
index 498bd43..3039e21 100644
--- a/src/transports/tcp/tcp.c
+++ b/src/transports/tcp/tcp.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/transports/tcp/tcp.h b/src/transports/tcp/tcp.h
index aa72d4e..ab55485 100644
--- a/src/transports/tcp/tcp.h
+++ b/src/transports/tcp/tcp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/backoff.c b/src/transports/utils/backoff.c
index cc4e38a..803ac42 100644
--- a/src/transports/utils/backoff.c
+++ b/src/transports/utils/backoff.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/backoff.h b/src/transports/utils/backoff.h
index 7d0bf2d..2ff1a6d 100644
--- a/src/transports/utils/backoff.h
+++ b/src/transports/utils/backoff.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/dns.c b/src/transports/utils/dns.c
index 1916e77..806dcc3 100644
--- a/src/transports/utils/dns.c
+++ b/src/transports/utils/dns.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/dns.h b/src/transports/utils/dns.h
index b6169f2..4db6149 100644
--- a/src/transports/utils/dns.h
+++ b/src/transports/utils/dns.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/dns_getaddrinfo.h b/src/transports/utils/dns_getaddrinfo.h
index 722fd10..69ae3d7 100644
--- a/src/transports/utils/dns_getaddrinfo.h
+++ b/src/transports/utils/dns_getaddrinfo.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/dns_getaddrinfo.inc b/src/transports/utils/dns_getaddrinfo.inc
index dac4b29..03a885f 100644
--- a/src/transports/utils/dns_getaddrinfo.inc
+++ b/src/transports/utils/dns_getaddrinfo.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/dns_getaddrinfo_a.h b/src/transports/utils/dns_getaddrinfo_a.h
index 24301cb..9140689 100644
--- a/src/transports/utils/dns_getaddrinfo_a.h
+++ b/src/transports/utils/dns_getaddrinfo_a.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/dns_getaddrinfo_a.inc b/src/transports/utils/dns_getaddrinfo_a.inc
index affeccd..9e3dd90 100644
--- a/src/transports/utils/dns_getaddrinfo_a.inc
+++ b/src/transports/utils/dns_getaddrinfo_a.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/iface.c b/src/transports/utils/iface.c
index e2d31a0..1d0b941 100644
--- a/src/transports/utils/iface.c
+++ b/src/transports/utils/iface.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/iface.h b/src/transports/utils/iface.h
index f2aecc0..30e2078 100644
--- a/src/transports/utils/iface.h
+++ b/src/transports/utils/iface.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/literal.c b/src/transports/utils/literal.c
index 48ab1b3..629de79 100644
--- a/src/transports/utils/literal.c
+++ b/src/transports/utils/literal.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/literal.h b/src/transports/utils/literal.h
index 55474f3..57506a4 100644
--- a/src/transports/utils/literal.h
+++ b/src/transports/utils/literal.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/port.c b/src/transports/utils/port.c
index 12c789b..988d2e2 100644
--- a/src/transports/utils/port.c
+++ b/src/transports/utils/port.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/port.h b/src/transports/utils/port.h
index 6495057..d6a3fff 100644
--- a/src/transports/utils/port.h
+++ b/src/transports/utils/port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/streamhdr.c b/src/transports/utils/streamhdr.c
index 26f7058..90896ba 100644
--- a/src/transports/utils/streamhdr.c
+++ b/src/transports/utils/streamhdr.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/transports/utils/streamhdr.h b/src/transports/utils/streamhdr.h
index 6bd81c0..01ed888 100644
--- a/src/transports/utils/streamhdr.h
+++ b/src/transports/utils/streamhdr.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/alloc.c b/src/utils/alloc.c
index 3d75f96..1766b1d 100644
--- a/src/utils/alloc.c
+++ b/src/utils/alloc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/alloc.h b/src/utils/alloc.h
index 1df58a8..9c4bf77 100644
--- a/src/utils/alloc.h
+++ b/src/utils/alloc.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/atomic.c b/src/utils/atomic.c
index 6d6c1fb..4018c7e 100644
--- a/src/utils/atomic.c
+++ b/src/utils/atomic.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/atomic.h b/src/utils/atomic.h
index 4333ec0..1518935 100644
--- a/src/utils/atomic.h
+++ b/src/utils/atomic.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/chunk.c b/src/utils/chunk.c
index dcd3385..702fdab 100644
--- a/src/utils/chunk.c
+++ b/src/utils/chunk.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2014 Achille Roussel All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/utils/chunk.h b/src/utils/chunk.h
index 10c6977..64e72e5 100644
--- a/src/utils/chunk.h
+++ b/src/utils/chunk.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/chunkref.c b/src/utils/chunkref.c
index 46b9e00..8f7eaa8 100644
--- a/src/utils/chunkref.c
+++ b/src/utils/chunkref.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/chunkref.h b/src/utils/chunkref.h
index 271e4c7..58d9a0f 100644
--- a/src/utils/chunkref.h
+++ b/src/utils/chunkref.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/clock.c b/src/utils/clock.c
index 5cff976..43c67e8 100644
--- a/src/utils/clock.c
+++ b/src/utils/clock.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
     Copyright (c) 2012 Julien Ammous
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/utils/clock.h b/src/utils/clock.h
index 888e67f..1bb04b9 100644
--- a/src/utils/clock.h
+++ b/src/utils/clock.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/cont.h b/src/utils/cont.h
index 4f7b600..116578f 100644
--- a/src/utils/cont.h
+++ b/src/utils/cont.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd.c b/src/utils/efd.c
index 370ff16..2693850 100644
--- a/src/utils/efd.c
+++ b/src/utils/efd.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd.h b/src/utils/efd.h
index 6980187..8d0906a 100644
--- a/src/utils/efd.h
+++ b/src/utils/efd.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_eventfd.h b/src/utils/efd_eventfd.h
index e6d090e..4740877 100644
--- a/src/utils/efd_eventfd.h
+++ b/src/utils/efd_eventfd.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_eventfd.inc b/src/utils/efd_eventfd.inc
index c073fa0..b192d23 100644
--- a/src/utils/efd_eventfd.inc
+++ b/src/utils/efd_eventfd.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_pipe.h b/src/utils/efd_pipe.h
index 405dc81..17d7ddc 100644
--- a/src/utils/efd_pipe.h
+++ b/src/utils/efd_pipe.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_pipe.inc b/src/utils/efd_pipe.inc
index f474037..57a1240 100644
--- a/src/utils/efd_pipe.inc
+++ b/src/utils/efd_pipe.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_socketpair.h b/src/utils/efd_socketpair.h
index 5017a61..45073b7 100644
--- a/src/utils/efd_socketpair.h
+++ b/src/utils/efd_socketpair.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_socketpair.inc b/src/utils/efd_socketpair.inc
index 596a8c1..2e76e2f 100644
--- a/src/utils/efd_socketpair.inc
+++ b/src/utils/efd_socketpair.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_win.h b/src/utils/efd_win.h
index cfd5f47..988d4fe 100644
--- a/src/utils/efd_win.h
+++ b/src/utils/efd_win.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/efd_win.inc b/src/utils/efd_win.inc
index 15df177..8d25340 100644
--- a/src/utils/efd_win.inc
+++ b/src/utils/efd_win.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/err.c b/src/utils/err.c
index fa6130f..d919ad6 100644
--- a/src/utils/err.c
+++ b/src/utils/err.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/err.h b/src/utils/err.h
index 7dfcced..8864e68 100644
--- a/src/utils/err.h
+++ b/src/utils/err.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/fast.h b/src/utils/fast.h
index 22f42dc..1dc94a5 100644
--- a/src/utils/fast.h
+++ b/src/utils/fast.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/glock.c b/src/utils/glock.c
index bb210c7..7fe0c6d 100644
--- a/src/utils/glock.c
+++ b/src/utils/glock.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/glock.h b/src/utils/glock.h
index 7ef7158..d264d89 100644
--- a/src/utils/glock.h
+++ b/src/utils/glock.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/hash.c b/src/utils/hash.c
index 3f311e1..d402148 100644
--- a/src/utils/hash.c
+++ b/src/utils/hash.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/hash.h b/src/utils/hash.h
index c033d36..09e4f4a 100644
--- a/src/utils/hash.h
+++ b/src/utils/hash.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/list.c b/src/utils/list.c
index 70648c3..90758c5 100644
--- a/src/utils/list.c
+++ b/src/utils/list.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/list.h b/src/utils/list.h
index a28348f..ec1ce13 100644
--- a/src/utils/list.h
+++ b/src/utils/list.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/msg.c b/src/utils/msg.c
index 33241de..3c45b32 100644
--- a/src/utils/msg.c
+++ b/src/utils/msg.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/msg.h b/src/utils/msg.h
index f7d169f..bf9a44d 100644
--- a/src/utils/msg.h
+++ b/src/utils/msg.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/mutex.c b/src/utils/mutex.c
index 9a92008..c69b9fe 100644
--- a/src/utils/mutex.c
+++ b/src/utils/mutex.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 2804b61..b65de41 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/queue.c b/src/utils/queue.c
index 069c734..722c4f2 100644
--- a/src/utils/queue.c
+++ b/src/utils/queue.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserv
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/queue.h b/src/utils/queue.h
index caff9b9..7b899b4 100644
--- a/src/utils/queue.h
+++ b/src/utils/queue.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/random.c b/src/utils/random.c
index 5e2ea8b..7238bec 100644
--- a/src/utils/random.c
+++ b/src/utils/random.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/random.h b/src/utils/random.h
index a8def6f..8e8c0d1 100644
--- a/src/utils/random.h
+++ b/src/utils/random.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/sem.c b/src/utils/sem.c
index dbf264e..17943d5 100644
--- a/src/utils/sem.c
+++ b/src/utils/sem.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/sem.h b/src/utils/sem.h
index 7e8c571..6cfc021 100644
--- a/src/utils/sem.h
+++ b/src/utils/sem.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/sleep.c b/src/utils/sleep.c
index 6965d09..6ae30bc 100644
--- a/src/utils/sleep.c
+++ b/src/utils/sleep.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/sleep.h b/src/utils/sleep.h
index bcea11b..de943c4 100644
--- a/src/utils/sleep.h
+++ b/src/utils/sleep.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/stopwatch.c b/src/utils/stopwatch.c
index 344362f..e0cc1d3 100644
--- a/src/utils/stopwatch.c
+++ b/src/utils/stopwatch.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/stopwatch.h b/src/utils/stopwatch.h
index 0d060c3..5e5d26f 100644
--- a/src/utils/stopwatch.h
+++ b/src/utils/stopwatch.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/thread.c b/src/utils/thread.c
index f54d2fb..9516faa 100644
--- a/src/utils/thread.c
+++ b/src/utils/thread.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/thread.h b/src/utils/thread.h
index 0d31c6c..d6bebc4 100644
--- a/src/utils/thread.h
+++ b/src/utils/thread.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/thread_posix.h b/src/utils/thread_posix.h
index 0b6b7c9..c007fa0 100644
--- a/src/utils/thread_posix.h
+++ b/src/utils/thread_posix.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/thread_posix.inc b/src/utils/thread_posix.inc
index 36038dc..88da1fd 100644
--- a/src/utils/thread_posix.inc
+++ b/src/utils/thread_posix.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2014 Achille Roussel All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/src/utils/thread_win.h b/src/utils/thread_win.h
index 0ed26de..5edb5c7 100644
--- a/src/utils/thread_win.h
+++ b/src/utils/thread_win.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/thread_win.inc b/src/utils/thread_win.inc
index e2a2442..a8d23b2 100644
--- a/src/utils/thread_win.inc
+++ b/src/utils/thread_win.inc
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/win.h b/src/utils/win.h
index 07554cb..dcfe06a 100644
--- a/src/utils/win.h
+++ b/src/utils/win.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/wire.c b/src/utils/wire.c
index 90595df..cd91f34 100644
--- a/src/utils/wire.c
+++ b/src/utils/wire.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/src/utils/wire.h b/src/utils/wire.h
index 21ab098..93c85db 100644
--- a/src/utils/wire.h
+++ b/src/utils/wire.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012-2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012-2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/block.c b/tests/block.c
index 12f8508..ffb6222 100644
--- a/tests/block.c
+++ b/tests/block.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/bus.c b/tests/bus.c
index c6b0536..8d931d5 100644
--- a/tests/bus.c
+++ b/tests/bus.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/cmsg.c b/tests/cmsg.c
index 36b0b70..e5ea1ba 100644
--- a/tests/cmsg.c
+++ b/tests/cmsg.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2014 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/device.c b/tests/device.c
index 1a24c46..c502add 100644
--- a/tests/device.c
+++ b/tests/device.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/domain.c b/tests/domain.c
index 8a3bf3b..d0a5e44 100644
--- a/tests/domain.c
+++ b/tests/domain.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/emfile.c b/tests/emfile.c
index c4d5254..01b0994 100644
--- a/tests/emfile.c
+++ b/tests/emfile.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/hash.c b/tests/hash.c
index 68f1a76..e51d5ad 100644
--- a/tests/hash.c
+++ b/tests/hash.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/inproc.c b/tests/inproc.c
index 36767b9..5d9d0b7 100644
--- a/tests/inproc.c
+++ b/tests/inproc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/inproc_shutdown.c b/tests/inproc_shutdown.c
index 0b8ebb9..1b8b4bc 100644
--- a/tests/inproc_shutdown.c
+++ b/tests/inproc_shutdown.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/iovec.c b/tests/iovec.c
index 31eeef1..a9c5970 100644
--- a/tests/iovec.c
+++ b/tests/iovec.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/ipc.c b/tests/ipc.c
index d893884..ecd6f67 100644
--- a/tests/ipc.c
+++ b/tests/ipc.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/ipc_shutdown.c b/tests/ipc_shutdown.c
index 3e7f2c2..9928306 100644
--- a/tests/ipc_shutdown.c
+++ b/tests/ipc_shutdown.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/ipc_stress.c b/tests/ipc_stress.c
index 5bc3c9c..308f900 100644
--- a/tests/ipc_stress.c
+++ b/tests/ipc_stress.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/msg.c b/tests/msg.c
index eb2410d..d0b006e 100644
--- a/tests/msg.c
+++ b/tests/msg.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/pair.c b/tests/pair.c
index a1333bb..51bce13 100644
--- a/tests/pair.c
+++ b/tests/pair.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/pipeline.c b/tests/pipeline.c
index 9fe4a16..6f1cda9 100644
--- a/tests/pipeline.c
+++ b/tests/pipeline.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/poll.c b/tests/poll.c
index 43e8d45..b516d67 100644
--- a/tests/poll.c
+++ b/tests/poll.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/prio.c b/tests/prio.c
index fe87627..90a75b8 100644
--- a/tests/prio.c
+++ b/tests/prio.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013-2014 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013-2014 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/pubsub.c b/tests/pubsub.c
index d157874..4f5b5d4 100644
--- a/tests/pubsub.c
+++ b/tests/pubsub.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/reqrep.c b/tests/reqrep.c
index 0842d20..51cef41 100644
--- a/tests/reqrep.c
+++ b/tests/reqrep.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/separation.c b/tests/separation.c
index 7762394..70591de 100644
--- a/tests/separation.c
+++ b/tests/separation.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
     Copyright (c) 2013 GoPivotal, Inc.  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/tests/survey.c b/tests/survey.c
index ae31c2c..28a0f0d 100644
--- a/tests/survey.c
+++ b/tests/survey.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/tcp.c b/tests/tcp.c
index 35d780b..50a4d66 100644
--- a/tests/tcp.c
+++ b/tests/tcp.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/tcp_shutdown.c b/tests/tcp_shutdown.c
index d5f83c2..9ca3940 100644
--- a/tests/tcp_shutdown.c
+++ b/tests/tcp_shutdown.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/term.c b/tests/term.c
index bd8644b..ced753e 100644
--- a/tests/term.c
+++ b/tests/term.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/timeo.c b/tests/timeo.c
index ceec881..164c41c 100644
--- a/tests/timeo.c
+++ b/tests/timeo.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2012 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2012 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),
diff --git a/tests/trie.c b/tests/trie.c
index 79c0345..a5aa382 100644
--- a/tests/trie.c
+++ b/tests/trie.c
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2013 250bpm s.r.o.  All rights reserved.
+    Copyright (c) 2013 Martin Sustrik  All rights reserved.
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"),