diff --git a/parser/parser-molcas/functionals.py b/parser/parser-molcas/functionals.py
index 7f51d52e76c2d8cfb13b94be84478df5887290dd..97cf13b76f034a6aff2a271c02318197813f94e0 100644
--- a/parser/parser-molcas/functionals.py
+++ b/parser/parser-molcas/functionals.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, Ankit Kariryaa
+# 
+#   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-molcas/generate_scala_testcode.py b/parser/parser-molcas/generate_scala_testcode.py
index bd881f59a4064b21fc8c76b4ead4a89615de3cfd..01c29011afcba1d0c124c2ede3f2022141e0b4c6 100755
--- a/parser/parser-molcas/generate_scala_testcode.py
+++ b/parser/parser-molcas/generate_scala_testcode.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, Ankit Kariryaa
+# 
+#   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-molcas/main.py b/parser/parser-molcas/main.py
index 07d3cac2f183ecbd95fde6680ed1691fdb68f84a..be05e084429d8bd49be749a2a05215acc14630c4 100755
--- a/parser/parser-molcas/main.py
+++ b/parser/parser-molcas/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, Ankit Kariryaa
+# 
+#   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-molcas/runtests.py b/parser/parser-molcas/runtests.py
index ab44ef86591c47ae2cd5af3e6353d2ae94da99e5..54630c6d9affe358ae7093068fa9bfdc2f4bbb0b 100755
--- a/parser/parser-molcas/runtests.py
+++ b/parser/parser-molcas/runtests.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, Ankit Kariryaa
+# 
+#   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-molcas/setup_paths.py b/parser/parser-molcas/setup_paths.py
index 013c4ec3d31018ccd29e7b7a084cf5a7ca44d999..107097497da15698b0aaa681d7e3421f9222a71c 100644
--- a/parser/parser-molcas/setup_paths.py
+++ b/parser/parser-molcas/setup_paths.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, Ankit Kariryaa
+# 
+#   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/src/main/scala/eu/nomad_lab/parsers/MolcasParser.scala b/src/main/scala/eu/nomad_lab/parsers/MolcasParser.scala
index fdf049e660d8a326dee13f5a9147b84db80493ac..16bce3692f22a19fcecfaa87b86a0d4528e121a1 100644
--- a/src/main/scala/eu/nomad_lab/parsers/MolcasParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/MolcasParser.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, Ankit Kariryaa
+ * 
+ *   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/MolcasParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/MolcasParserSpec.scala
index fa30a12e540a5fdf24476d5de5ea770f31e7085f..bbcc417232fa9075d1bf3bb599be766f6bd8a1f1 100644
--- a/src/test/scala/eu/nomad_lab/parsers/MolcasParserSpec.scala
+++ b/src/test/scala/eu/nomad_lab/parsers/MolcasParserSpec.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, Ankit Kariryaa
+ * 
+ *   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 }