diff --git a/b/Boost/Boost-1.63.0-foss-2015g-Python-3.6.1.eb b/b/Boost/Boost-1.63.0-foss-2015g-Python-3.6.1.eb
new file mode 100644
index 00000000..536dd0ec
--- /dev/null
+++ b/b/Boost/Boost-1.63.0-foss-2015g-Python-3.6.1.eb
@@ -0,0 +1,27 @@
+name = 'Boost'
+version = '1.63.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://www.boost.org/'
+description = """Boost provides free peer-reviewed portable C++ source libraries."""
+
+toolchain = {'name': 'foss', 'version': '2015g'}
+toolchainopts = {'pic': True, 'usempi': True}
+
+source_urls = [SOURCEFORGE_SOURCE]
+sources = ['%%(namelower)s_%s.tar.gz' % '_'.join(version.split('.'))]
+
+patches = [
+    'Boost-%(version)s_python3.patch',
+]
+
+dependencies = [
+    ('bzip2', '1.0.6', '', True),
+    ('zlib', '1.2.11', '', True),
+    ('Python', '3.6.1', '', True),
+]
+
+# also build boost_mpi
+boost_mpi = True
+
+moduleclass = 'devel'
diff --git a/c/CNTK/CNTK-2.0-Python-3.6.1.eb b/c/CNTK/CNTK-2.0-Python-3.6.1.eb
new file mode 100644
index 00000000..f2911eb5
--- /dev/null
+++ b/c/CNTK/CNTK-2.0-Python-3.6.1.eb
@@ -0,0 +1,35 @@
+# IT4Innovation 2017
+
+easyblock = 'PythonPackage'
+
+name = 'CNTK'
+version = '2.0'
+versionsuffix = '-Python-%(pyver)s'
+
+homepage = 'http://deeplearning.net/software/theano'
+description = """Theano is a Python library that allows you to define, optimize,
+and evaluate mathematical expressions involving multi-dimensional arrays efficiently."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+
+source_urls = ['https://cntk.ai/PythonWheel/CPU-Only']
+sources = ['cntk-2.0-cp36-cp36m-linux_x86_64.whl']
+
+dependencies = [
+    ('glibc', '2.14', '', True),
+    ('Python', '3.6.1', '', True),
+    ('OpenMPI', '1.10.7')
+]
+
+unpack_sources = False
+
+use_pip = True
+
+skipsteps = ['sanitycheck']
+
+sanity_check_paths = {
+    'files': [''],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/c/CNTK/CNTK-2.0-foss-2017a-Python-3.6.1.eb b/c/CNTK/CNTK-2.0-foss-2017a-Python-3.6.1.eb
index d427a36c..dc80b1d6 100644
--- a/c/CNTK/CNTK-2.0-foss-2017a-Python-3.6.1.eb
+++ b/c/CNTK/CNTK-2.0-foss-2017a-Python-3.6.1.eb
@@ -7,7 +7,7 @@ versionsuffix = '-Python-%(pyver)s'
 homepage = 'https://cntk.ai/'
 description = """The Microsoft Cognitive Toolkit is a unified deep-learning toolkit that describes neural networks as a series of computational steps via a directed graph. In this directed graph, leaf nodes represent input values or network parameters, while other nodes represent matrix operations upon their inputs. CNTK allows to easily realize and combine popular model types such as feed-forward DNNs, convolutional nets (CNNs), and recurrent networks (RNNs/LSTMs). It implements stochastic gradient descent (SGD, error backpropagation) learning with automatic differentiation and parallelization across multiple GPUs and servers. """
 
-toolchain = {'name': 'foss', 'version': '2017a'}
+toolchain = {'name': 'foss', 'version': '2015g'}
 
 patches = [
     'glibc.patch',
@@ -21,28 +21,28 @@ dependencies = [
     ('Python', '3.6.1', '', True),
     ('libzip', '1.2.0', '', True),
     ('zlib', '1.2.11', '', True),
-    ('protobuf', '3.2.0', versionsuffix, True),
+    ('protobuf', '3.3.0', '', ('GCC', '4.9.3-2.25')),
     ('CNTKCustomMKL','3.0', '', True),
-    ('Boost', '1.63.0', versionsuffix, ('foss', '2017a')),
+    ('Boost', '1.63.0', versionsuffix),
     ('SWIG', '3.0.12', versionsuffix, True),
-#    ('OpenMPI', '1.8.6', '', ('GCC', '4.4.7-system')),
+    ('OpenMPI', '1.8.6', '', ('GCC', '4.4.7-system')),
 ]
 
 prefix_opt = '--with-build-top='
 
 preconfigopts = 'sed -i "s/cntk_custom_mkl_version=3/cntk_custom_mkl_version=3.0/" configure && '
 preconfigopts += 'sed -i "s/-Werror//" Makefile && '
-#preconfigopts += 'sed -i "s/#include <limits>/#include <limits>\\n#include <stdlib.h>/" Source/Math/BlockMultiplierPlatform.h &&'
+preconfigopts += 'sed -i "s/-rdynamic/-rdynamic -ldl/" Makefile && '
 
 prebuildopts = 'cd %(installdir)s &&'
 
 configopts = '--with-py-versions=36 --with-buildtype=release --mpi=yes --python=yes --asgd=no '
 configopts += '--with-boost=$EBROOTBOOST --with-protobuf=$EBROOTPROTOBUF --with-swig=$EBROOTSWIG --with-libzip=$EBROOTLIBZIP '
-configopts += '--with-mpi=$EBROOTOPENMPI --with-py36-path=$EBROOTPYTHON --with-mkl=/apps/all/CNTKCustomMKL/ '
+configopts += '--with-mpi=$EBROOTOPENMPI --with-py36-path=$EBROOTPYTHON --with-mkl=/apps/all/CNTKCustomMKL '
 
 sanity_check_paths = {
     'files': [],
-    'dirs': ['lib'],
+    'dirs': ['lib', 'bin', 'python'],
 }
 
-moduleclass = 'math'
+moduleclass = 'lib'
diff --git a/c/CNTK/a.out b/c/CNTK/a.out
new file mode 100644
index 00000000..e69de29b
diff --git a/g/glibc/glibc-2.14.eb b/g/glibc/glibc-2.14.eb
index 638b84a8..8d0336bb 100644
--- a/g/glibc/glibc-2.14.eb
+++ b/g/glibc/glibc-2.14.eb
@@ -3,9 +3,8 @@ easyblock = 'ConfigureMake'
 name = 'glibc'
 version = '2.14'
 
-homepage = 'http://git-scm.com/'
-description = """Git is a free and open source distributed version control system designed
-to handle everything from small to very large projects with speed and efficiency."""
+homepage = 'https://www.gnu.org/software/libc/'
+description = """The Glibc package contains the main C library. This library provides the basic routines for allocating memory, searching directories, opening and closing files, reading and writing files, string handling, pattern matching, arithmetic, and so on."""
 
 toolchain = {'name': 'dummy', 'version': ''}
 
@@ -15,7 +14,7 @@ source_urls = ['http://ftp.gnu.org/gnu/glibc/']
 preconfigopts = 'mkdir build && '
 preconfigopts += 'cd build && '
 configure_cmd_prefix = '.'
-configopts = '--enable-kernel=2.6.32'
+configopts = '--enable-kernel=2.6.32 --enable-obsolete-rpc --enable-stack-protector=strong'
 prebuildopts = 'cd build && ' 
 preinstallopts= 'cd build && '
 
diff --git a/g/glibc/libc-2.14-6.3.0.eb b/g/glibc/libc-2.14-6.3.0.eb
new file mode 100644
index 00000000..39666f33
--- /dev/null
+++ b/g/glibc/libc-2.14-6.3.0.eb
@@ -0,0 +1,16 @@
+easyblock = 'Toolchain'
+
+name = 'libc'
+version = '2.14-6.3.0'
+
+homepage = 'https://www.gnu.org/software/libc/'
+description = """The Glibc package contains the main C library. This library provides the basic routines for allocating memory, searching directories, opening and closing files, reading and writing files, string handling, pattern matching, arithmetic, and so on."""
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+dependencies = [
+    ('GCCcore', '6.3.0'),
+    ('glibc', '2.14')
+]
+
+moduleclass = 'toolchain'
diff --git a/k/Keras/Keras-2.0.5-CNTK-1.2.0-Python-3.6.1.eb b/k/Keras/Keras-2.0.5-CNTK-1.2.0-Python-3.6.1.eb
new file mode 100644
index 00000000..9bf56230
--- /dev/null
+++ b/k/Keras/Keras-2.0.5-CNTK-1.2.0-Python-3.6.1.eb
@@ -0,0 +1,33 @@
+easyblock = 'PythonPackage'
+
+name = 'Keras'
+version = '2.0.5'
+versionsuffix = '-CNTK-1.2.0-Python-%(pyver)s'
+
+homepage = 'https://keras.io/'
+description = """Keras is a minimalist, highly modular neural networks library, written in Python and
+capable of running on top of either TensorFlow or Theano."""
+
+toolchain = {'name': 'foss', 'version': '2017a'}
+
+source_urls = [PYPI_SOURCE]
+sources = [SOURCE_TAR_GZ]
+
+use_pip = True
+
+dependencies = [
+    ('Python', '3.6.1', '', True),
+    ('CNTK', '2.0', '-Python-%(pyver)s'),
+#   ('h5py', '2.7.0', '%(versionsuffix)s'), internal Python 3.6.1
+#   ('PyYAML', '3.12', versionsuffix),      internal Python 3.6.1
+]
+
+# it defaults to Tensorflow
+modextravars = {'KERAS_BACKEND': 'cntk'}
+
+sanity_check_paths = {
+    'files': [],
+    'dirs': ['lib/python%(pyshortver)s/site-packages'],
+}
+
+moduleclass = 'math'
diff --git a/p/Python/.Python-3.6.1-glibc-2.14.eb.swp b/p/Python/.Python-3.6.1-glibc-2.14.eb.swp
new file mode 100644
index 00000000..d3ef1bf9
Binary files /dev/null and b/p/Python/.Python-3.6.1-glibc-2.14.eb.swp differ
diff --git a/p/Python/Python-3.6.1-glibc-2.14-6.3.0.eb b/p/Python/Python-3.6.1-glibc-2.14-6.3.0.eb
new file mode 100644
index 00000000..5bec949a
--- /dev/null
+++ b/p/Python/Python-3.6.1-glibc-2.14-6.3.0.eb
@@ -0,0 +1,47 @@
+# IT4Innovation 2017
+
+name = 'Python'
+version = '3.6.1'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = {'name': 'libc', 'version': '2.14'}
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('libreadline', '7.0'),
+    ('SQLite', '3.17.0'),
+    ('Tk', '8.6.6'),
+    ('GMP', '6.1.2'),
+    ('XZ', '5.2.3'),
+    ('zlib', '1.2.11'),
+    ('ncurses', '6.0'),
+#   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+#   nice to have an up to date openssl for security reasons
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev')]
+
+# order is important!
+# package versions updated Feb 25th 2016
+exts_list = [
+    ('setuptools', '20.1.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '8.0.2', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+]
+
+#modluafooter = 'add_property("state","experimental")'
+
+moduleclass = 'lang'
diff --git a/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb b/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb
index e72f414a..4ef3c2b8 100644
--- a/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb
+++ b/p/protobuf/protobuf-3.2.0-Python-3.6.1.eb
@@ -8,6 +8,7 @@ homepage = 'https://code.google.com/p/protobuf/'
 description = """Google Protocol Buffers"""
 
 toolchain = {'name': 'dummy', 'version': ''}
+toolchainopts = {'pic': True}
 
 sources = ['%(name)s-python-%(version)s.tar.gz']
 source_urls = ['https://github.com/google/protobuf/releases/download/v%(version)s/']
diff --git a/p/protobuf/protobuf-3.3.0-GCC-4.9.3-2.25.eb b/p/protobuf/protobuf-3.3.0-GCC-4.9.3-2.25.eb
new file mode 100644
index 00000000..ef2c3bb1
--- /dev/null
+++ b/p/protobuf/protobuf-3.3.0-GCC-4.9.3-2.25.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.3.0'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'GCC', 'version': '4.9.3-2.25'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s/']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [('Autotools', '20150215', '', True)]
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['bin/protoc', 'lib/libprotobuf.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'
diff --git a/p/protobuf/protobuf-3.3.0-foss-2017a.eb b/p/protobuf/protobuf-3.3.0-foss-2017a.eb
new file mode 100644
index 00000000..81f15887
--- /dev/null
+++ b/p/protobuf/protobuf-3.3.0-foss-2017a.eb
@@ -0,0 +1,24 @@
+easyblock = 'ConfigureMake'
+
+name = 'protobuf'
+version = '3.3.0'
+
+homepage = 'https://github.com/google/protobuf/'
+description = """Google Protocol Buffers"""
+
+toolchain = {'name': 'foss', 'version': '2017a'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/google/protobuf/archive/v%(version)s/']
+sources = [SOURCE_TAR_GZ]
+
+builddependencies = [('Autotools', '20150215', '', True)]
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['bin/protoc', 'lib/libprotobuf.%s' % SHLIB_EXT],
+    'dirs': [],
+}
+
+moduleclass = 'devel'