diff --git a/parser/parser-gulp/generate_scala_testcode.py b/parser/parser-gulp/generate_scala_testcode.py
index 089840bef183e8e26b9692b4a6d01eac55de8e92..5acffbb6fc49c27adac45db6306642ce7d20b034 100755
--- a/parser/parser-gulp/generate_scala_testcode.py
+++ b/parser/parser-gulp/generate_scala_testcode.py
@@ -1,4 +1,18 @@
 #!/usr/bin/env python
+# Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+# 
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 from __future__ import print_function
 import os
 from glob import glob
diff --git a/parser/parser-gulp/main.py b/parser/parser-gulp/main.py
index 147c4374d12d68d158dd1abba730ca6f1b679470..d94003f89cf74e7df267a22bb8299e5ee2af599a 100644
--- a/parser/parser-gulp/main.py
+++ b/parser/parser-gulp/main.py
@@ -1,16 +1,17 @@
-# Copyright 2016-2018 The NOMAD Developers Group
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
+# Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+# 
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+# 
 #     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 #
 # Main author and maintainer: Ask Hjorth Larsen <asklarsen@gmail.com>
 
diff --git a/parser/parser-gulp/runtests.py b/parser/parser-gulp/runtests.py
index c4af0f33be278fce6cc2b5e20acea52ef153292f..a8122e203ded651004ea906849e6ee2f16eeed4e 100755
--- a/parser/parser-gulp/runtests.py
+++ b/parser/parser-gulp/runtests.py
@@ -1,4 +1,18 @@
 #!/usr/bin/env python
+# Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+# 
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 from __future__ import print_function
 from glob import glob
 import re
diff --git a/parser/parser-gulp/setup_paths.py b/parser/parser-gulp/setup_paths.py
index e0a0fb009256a0d4056e81c12e82d15bfd3ea7c4..d919821887f6961d953bf12534f5fa633208fe4f 100644
--- a/parser/parser-gulp/setup_paths.py
+++ b/parser/parser-gulp/setup_paths.py
@@ -1,3 +1,17 @@
+# Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+# 
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 import sys, os, os.path
 baseDir = os.path.dirname(os.path.abspath(__file__))
 commonDir = os.path.normpath(os.path.join(baseDir,"../../../../python-common/common/python"))
diff --git a/parser/parser-gulp/spacegroups.py b/parser/parser-gulp/spacegroups.py
index 90e31c267d5c28812845e036db7973ee527d675e..3acba5b03fe2c96d3672df402072ae47edd2dc6e 100644
--- a/parser/parser-gulp/spacegroups.py
+++ b/parser/parser-gulp/spacegroups.py
@@ -1,3 +1,17 @@
+# Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+# 
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
 # All the space groups that GULP will print
 sg = ['P 1             ','P -1            ','P 2             ','P 21            ',
       'C 2             ','P M             ','P C             ','C M             ','C C             ',
diff --git a/src/main/scala/eu/nomad_lab/parsers/GulpParser.scala b/src/main/scala/eu/nomad_lab/parsers/GulpParser.scala
index d99b20a51b5d39a7fb785e5403baeb995b5bcf60..afe5701fbb0a060e779d603d9b1b4f1249d608ae 100644
--- a/src/main/scala/eu/nomad_lab/parsers/GulpParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/GulpParser.scala
@@ -1,18 +1,19 @@
 /*
-   Copyright 2016-2017 The NOMAD Developers Group
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ * Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+ * 
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  */
+
 package eu.nomad_lab.parsers
 
 import eu.{ nomad_lab => lab }
diff --git a/src/test/scala/eu/nomad_lab/parsers/GulpParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/GulpParserSpec.scala
index 99f915b4c0ad499f203fc9ae1958ec5630a86c01..71f7d0ad59c5869725c65a6affdeb8c83488a43a 100644
--- a/src/test/scala/eu/nomad_lab/parsers/GulpParserSpec.scala
+++ b/src/test/scala/eu/nomad_lab/parsers/GulpParserSpec.scala
@@ -1,18 +1,19 @@
 /*
-   Copyright 2016-2017 The NOMAD Developers Group
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+ * Copyright 2016-2018 Ask Hjorth Larsen, Fawzi Mohamed
+ * 
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
  */
+
 package eu.nomad_lab.parsers
 
 import eu.nomad_lab.{ parsers, DefaultPythonInterpreter }