diff --git a/example/example.cpp b/example/example.cpp
index ba0ff28..34b2df7 100644
--- a/example/example.cpp
+++ b/example/example.cpp
@@ -1,7 +1,7 @@
 /*
     example/example.cpp -- pybind example plugin
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example1.cpp b/example/example1.cpp
index 2a0038d..dd651fb 100644
--- a/example/example1.cpp
+++ b/example/example1.cpp
@@ -2,7 +2,7 @@
     example/example1.cpp -- constructors, deconstructors, attribute access,
     __str__, argument and return value conventions
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example10.cpp b/example/example10.cpp
index 1a377e5..09769fe 100644
--- a/example/example10.cpp
+++ b/example/example10.cpp
@@ -2,7 +2,7 @@
     example/example10.cpp -- auto-vectorize functions over NumPy array
     arguments
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example11.cpp b/example/example11.cpp
index e7069de..1a472c9 100644
--- a/example/example11.cpp
+++ b/example/example11.cpp
@@ -1,7 +1,7 @@
 /*
     example/example11.cpp -- keyword arguments and default values
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example12.cpp b/example/example12.cpp
index 97ba6a8..84b1c35 100644
--- a/example/example12.cpp
+++ b/example/example12.cpp
@@ -1,7 +1,7 @@
 /*
     example/example12.cpp -- overriding virtual functions from Python
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example13.cpp b/example/example13.cpp
index 782db31..6c1b876 100644
--- a/example/example13.cpp
+++ b/example/example13.cpp
@@ -2,7 +2,7 @@
     example/example13.cpp -- keep_alive modifier (pybind11's version
     of Boost.Python's with_custodian_and_ward / with_custodian_and_ward_postcall)
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example14.cpp b/example/example14.cpp
index abae021..a7d285a 100644
--- a/example/example14.cpp
+++ b/example/example14.cpp
@@ -1,7 +1,7 @@
 /*
     example/example14.cpp -- opaque types, passing void pointers
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example15.cpp b/example/example15.cpp
index bfc7526..acdd368 100644
--- a/example/example15.cpp
+++ b/example/example15.cpp
@@ -1,7 +1,7 @@
 /*
     example/example15.cpp -- pickle support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example16.cpp b/example/example16.cpp
index 350435f..7b676a9 100644
--- a/example/example16.cpp
+++ b/example/example16.cpp
@@ -1,7 +1,7 @@
 /*
     example/example16.cpp -- automatic upcasting for polymorphic types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example2.cpp b/example/example2.cpp
index 2d49286..9b91baa 100644
--- a/example/example2.cpp
+++ b/example/example2.cpp
@@ -2,7 +2,7 @@
     example/example2.cpp2 -- singleton design pattern, static functions and
     variables, passing and interacting with Python types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example3.cpp b/example/example3.cpp
index 3b3a625..af956b1 100644
--- a/example/example3.cpp
+++ b/example/example3.cpp
@@ -1,7 +1,7 @@
 /*
     example/example3.cpp -- operator overloading
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example4.cpp b/example/example4.cpp
index e673c4a..281eafe 100644
--- a/example/example4.cpp
+++ b/example/example4.cpp
@@ -1,7 +1,7 @@
 /*
     example/example4.cpp -- global constants and functions, enumerations, raw byte strings
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example5.cpp b/example/example5.cpp
index ad24ef0..4ba6a34 100644
--- a/example/example5.cpp
+++ b/example/example5.cpp
@@ -2,7 +2,7 @@
     example/example5.cpp -- inheritance, callbacks, acquiring and releasing the
     global interpreter lock
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example6.cpp b/example/example6.cpp
index 89db2fb..26552b7 100644
--- a/example/example6.cpp
+++ b/example/example6.cpp
@@ -2,7 +2,7 @@
     example/example6.cpp -- supporting Pythons' sequence protocol, iterators,
     etc.
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example7.cpp b/example/example7.cpp
index b68b553..415b097 100644
--- a/example/example7.cpp
+++ b/example/example7.cpp
@@ -1,7 +1,7 @@
 /*
     example/example7.cpp -- supporting Pythons' buffer protocol
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example8.cpp b/example/example8.cpp
index f492588..dbdd421 100644
--- a/example/example8.cpp
+++ b/example/example8.cpp
@@ -2,7 +2,7 @@
     example/example8.cpp -- binding classes with custom reference counting,
     implicit conversions between types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/example9.cpp b/example/example9.cpp
index f64b539..ca75ecc 100644
--- a/example/example9.cpp
+++ b/example/example9.cpp
@@ -2,7 +2,7 @@
     example/example9.cpp -- nested modules, importing modules, and
                             internal references
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/example/issues.cpp b/example/issues.cpp
index 09547ae..b0f3a6b 100644
--- a/example/issues.cpp
+++ b/example/issues.cpp
@@ -1,7 +1,7 @@
 /*
     example/issues.cpp -- collection of testcases for miscellaneous issues
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/attr.h b/include/pybind11/attr.h
index 759feed..86face3 100644
--- a/include/pybind11/attr.h
+++ b/include/pybind11/attr.h
@@ -2,7 +2,7 @@
     pybind11/pybind11.h: Infrastructure for processing custom
     type and function attributes
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h
index 6a9ad7c..8625d8a 100644
--- a/include/pybind11/cast.h
+++ b/include/pybind11/cast.h
@@ -2,7 +2,7 @@
     pybind11/cast.h: Partial template specializations to cast between
     C++ and Python types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/common.h b/include/pybind11/common.h
index 15047b8..9739cda 100644
--- a/include/pybind11/common.h
+++ b/include/pybind11/common.h
@@ -1,7 +1,7 @@
 /*
     pybind11/common.h -- Basic macros
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
@@ -39,7 +39,7 @@
 #  pragma warning(push)
 #  pragma warning(disable: 4510 4610 4512 4005)
 #  if _DEBUG
-#    define _DEBUG_MARKER
+#    define PYBIND11_DEBUG_MARKER
 #    undef _DEBUG
 #  endif
 #endif
@@ -58,10 +58,10 @@
 #endif
 
 #if defined(_MSC_VER)
-#  if defined(_DEBUG_MARKER)
+#  if defined(PYBIND11_DEBUG_MARKER)
 #    define _DEBUG
-#  undef _DEBUG_MARKER
-#endif
+#    undef PYBIND11_DEBUG_MARKER
+#  endif
 #  pragma warning(pop)
 #endif
 
diff --git a/include/pybind11/complex.h b/include/pybind11/complex.h
index a140f6f..ba0b297 100644
--- a/include/pybind11/complex.h
+++ b/include/pybind11/complex.h
@@ -1,7 +1,7 @@
 /*
     pybind11/complex.h: Complex number support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/descr.h b/include/pybind11/descr.h
index b040014..1b65f68 100644
--- a/include/pybind11/descr.h
+++ b/include/pybind11/descr.h
@@ -2,7 +2,7 @@
     pybind11/descr.h: Helper type for concatenating type signatures
     either at runtime (C++11) or compile time (C++14)
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/functional.h b/include/pybind11/functional.h
index f00a603..5074833 100644
--- a/include/pybind11/functional.h
+++ b/include/pybind11/functional.h
@@ -1,7 +1,7 @@
 /*
     pybind11/functional.h: std::function<> support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h
index 3386876..38d30bf 100644
--- a/include/pybind11/numpy.h
+++ b/include/pybind11/numpy.h
@@ -1,7 +1,7 @@
 /*
     pybind11/numpy.h: Basic NumPy support, auto-vectorization support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/operators.h b/include/pybind11/operators.h
index b10bfe3..305cd2c 100644
--- a/include/pybind11/operators.h
+++ b/include/pybind11/operators.h
@@ -1,7 +1,7 @@
 /*
     pybind11/operator.h: Metatemplates for operator overloading
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h
index a9707c4..f653ba9 100644
--- a/include/pybind11/pybind11.h
+++ b/include/pybind11/pybind11.h
@@ -2,7 +2,7 @@
     pybind11/pybind11.h: Main header file of the C++11 python
     binding generator library
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/pytypes.h b/include/pybind11/pytypes.h
index c7f109c..b811552 100644
--- a/include/pybind11/pytypes.h
+++ b/include/pybind11/pytypes.h
@@ -1,7 +1,7 @@
 /*
     pybind11/typeid.h: Convenience wrapper classes for basic Python types
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/stl.h b/include/pybind11/stl.h
index 97ccdbc..39adc7e 100644
--- a/include/pybind11/stl.h
+++ b/include/pybind11/stl.h
@@ -1,7 +1,7 @@
 /*
     pybind11/complex.h: Complex number support
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/include/pybind11/typeid.h b/include/pybind11/typeid.h
index b395110..c903fb1 100644
--- a/include/pybind11/typeid.h
+++ b/include/pybind11/typeid.h
@@ -1,7 +1,7 @@
 /*
     pybind11/typeid.h: Compiler-independent access to type identifiers
 
-    Copyright (c) 2015 Wenzel Jakob <wenzel@inf.ethz.ch>
+    Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
 
     All rights reserved. Use of this source code is governed by a
     BSD-style license that can be found in the LICENSE file.
diff --git a/setup.py b/setup.py
index 362b753..7562860 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
     version=__version__,
     description='Seamless operability between C++11 and Python',
     author='Wenzel Jakob',
-    author_email='wenzel@inf.ethz.ch',
+    author_email='wenzel.jakob@epfl.ch',
     url='https://github.com/wjakob/pybind11',
     download_url='https://github.com/wjakob/pybind11/tarball/v' + __version__,
     packages=['pybind11'],