diff --git a/parser/parser-siesta/inputvars.py b/parser/parser-siesta/inputvars.py
index 1796346001e0fe9ad9c4c4daf8287cc3020264a7..7c729a01d5d731193286881a00f4ae8c7bb3b979 100644
--- a/parser/parser-siesta/inputvars.py
+++ b/parser/parser-siesta/inputvars.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-siesta/main.py b/parser/parser-siesta/main.py
index 33c6458b5c81db1969aa7ccf543acb16bfd952e2..e2868c402e0cc457b91abf03cda0ee2654d375f4 100644
--- a/parser/parser-siesta/main.py
+++ b/parser/parser-siesta/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-siesta/mkjson.py b/parser/parser-siesta/mkjson.py
index 5ec81b65b5d21bc0500aca68be31dd73bdbe5ccf..42295db6660949e477c3e90a6242c5faf0b300eb 100644
--- a/parser/parser-siesta/mkjson.py
+++ b/parser/parser-siesta/mkjson.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-siesta/pycheck.py b/parser/parser-siesta/pycheck.py
index b26f90248f7bdfd49dc01c14f2502d5b31c65675..eb14e4e0646c59fd8fa94de547866b89b3246b4e 100755
--- a/parser/parser-siesta/pycheck.py
+++ b/parser/parser-siesta/pycheck.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-siesta/setup_paths.py b/parser/parser-siesta/setup_paths.py
index 013c4ec3d31018ccd29e7b7a084cf5a7ca44d999..6de0bab0e3f49afcc980527567d8e0b770649bf7 100644
--- a/parser/parser-siesta/setup_paths.py
+++ b/parser/parser-siesta/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
+# 
+#   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/SiestaParser.scala b/src/main/scala/eu/nomad_lab/parsers/SiestaParser.scala
index 924d557bc8e98fa1f7726e2bcc3c2e7369383de9..103b0a937f4913d304b0e9cd7a0000246e535257 100644
--- a/src/main/scala/eu/nomad_lab/parsers/SiestaParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/SiestaParser.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/SiestaParserSpec.scala b/src/test/scala/eu/nomad_lab/parsers/SiestaParserSpec.scala
index 946d473dc139c68d4989c13261fec1b2da07d0f5..2679335dce8398a95baf4fc99fcf529213e47f70 100644
--- a/src/test/scala/eu/nomad_lab/parsers/SiestaParserSpec.scala
+++ b/src/test/scala/eu/nomad_lab/parsers/SiestaParserSpec.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 org.specs2.mutable.Specification