diff --git a/docs_requirements.txt b/docs_requirements.txt
index 544d45e5b02d..a8abb189efee 100644
--- a/docs_requirements.txt
+++ b/docs_requirements.txt
@@ -1,4 +1,6 @@
 sphinx
 sphinx_rtd_theme
 jsonschema
-sphinxcontrib-jsonschema
\ No newline at end of file
+sphinxcontrib-jsonschema
+nbconvert
+ipython
diff --git a/environment.yml b/environment.yml
index 21e52feaf866..da7c3d72470d 100644
--- a/environment.yml
+++ b/environment.yml
@@ -9,7 +9,7 @@ dependencies:
  - python=3.6
  - jsonschema
  - pyvisa
- - QtPy=1.2.0
+ - QtPy
  - sip
  - pyqt=5.6.0
  - numpy
diff --git a/requirements.txt b/requirements.txt
index 52bffd4da99b..32d5add6fb32 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,8 @@
-jupyter==1.0.0
-numpy==1.12.1
+numpy==1.13.1
 matplotlib==2.0.2
 pyqtgraph==0.10.0
 PyVISA==1.8
-PyQt5==5.7.1
-sip==4.19
-QtPy==1.2.0
-h5py==2.7.0
+PyQt5==5.9
+sip==4.19.3
+QtPy==1.3.1
+h5py==2.7.1
diff --git a/setup.py b/setup.py
index 4bc1c18289b5..2aafa4750406 100644
--- a/setup.py
+++ b/setup.py
@@ -36,8 +36,8 @@ def readme():
       version=get_version(),
       use_2to3=False,
 
-      maintainer='Giulio Ungaretti',
-      maintainer_email='unga@nbi.ku.dk',
+      maintainer='Jens H Nielsen',
+      maintainer_email='j.h.nielsen@nbi.ku.dk',
       description='Python-based data acquisition framework developed by the '
                   'Copenhagen / Delft / Sydney / Microsoft quantum computing '
                   'consortium',
@@ -48,6 +48,7 @@ def readme():
           'Intended Audience :: Science/Research',
           'Programming Language :: Python :: 3 :: Only',
           'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
           'Topic :: Scientific/Engineering'
       ],
       license='MIT',
@@ -58,9 +59,6 @@ def readme():
       install_requires= [
           'numpy>=1.10',
           'pyvisa>=1.8',
-          'ipython>=4.1.0',
-          'ipykernel!=4.6.0', # https://github.com/ipython/ipykernel/issues/240 in 4.6
-          'jupyter>=1.0.0',
           'h5py>=2.6'
       ],