diff --git a/near-rt-ric-simulator/.gitignore b/near-rt-ric-simulator/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..1fe9c87ddeee728ac31b88afacc77ae6a712e3b6
--- /dev/null
+++ b/near-rt-ric-simulator/.gitignore
@@ -0,0 +1,53 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+/logs
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# dependencies
+/node
+/node_modules
+
+/.classpath
+/.project
+/.settings
+target
+/.mvn/wrapper/maven-wrapper.jar
+/.tox
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/build/
+
+### visual studio ###
+.vs
+**/.vscode
+
+# OSx cruft
+**/.DS_Store
+
+# documentation
+.tox
+docs/_build/*
diff --git a/near-rt-ric-simulator/LICENSES.txt b/near-rt-ric-simulator/LICENSES.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9e98e141bd46ad4daa87326574449b14f3efc55a
--- /dev/null
+++ b/near-rt-ric-simulator/LICENSES.txt
@@ -0,0 +1,30 @@
+LICENSES.txt
+
+
+Unless otherwise specified, all software contained herein is licensed
+under the Apache License, Version 2.0 (the "Software License");
+you may not use this software except in compliance with the Software
+License. You may obtain a copy of the Software License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the Software License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the Software License for the specific language governing permissions
+and limitations under the Software License.
+
+
+Unless otherwise specified, all documentation contained herein is licensed
+under the Creative Commons License, Attribution 4.0 Intl. (the
+"Documentation License"); you may not use this documentation except in
+compliance with the Documentation License. You may obtain a copy of the
+Documentation License at
+
+https://creativecommons.org/licenses/by/4.0/
+
+Unless required by applicable law or agreed to in writing, documentation
+distributed under the Documentation License is distributed on an "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the Documentation License for the specific language governing
+permissions and limitations under the Documentation License.
diff --git a/near-rt-ric-simulator/scripts/a1.py b/near-rt-ric-simulator/scripts/a1.py
index 13ea7dc73855869bd92516eb1b214f5ea21efc24..006d04d06728a5efee25babd928490d4c735b227 100644
--- a/near-rt-ric-simulator/scripts/a1.py
+++ b/near-rt-ric-simulator/scripts/a1.py
@@ -5,9 +5,9 @@
 #  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.
diff --git a/near-rt-ric-simulator/scripts/commands.sh b/near-rt-ric-simulator/scripts/commands.sh
index 75c1d22e5b64137ebc77af0e8d7fde79de90cdba..8c47afc2e37bef351907a1fbd6447074e635e58a 100755
--- a/near-rt-ric-simulator/scripts/commands.sh
+++ b/near-rt-ric-simulator/scripts/commands.sh
@@ -5,9 +5,9 @@
 #  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.
diff --git a/near-rt-ric-simulator/scripts/main.py b/near-rt-ric-simulator/scripts/main.py
index 749058d0193d9f24c34dab1b50b67d66a96a4c8b..adbf1e5365e7935472e543bcd764c7d07a55de6d 100644
--- a/near-rt-ric-simulator/scripts/main.py
+++ b/near-rt-ric-simulator/scripts/main.py
@@ -5,9 +5,9 @@
 #  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.
diff --git a/near-rt-ric-simulator/scripts/start_simulator.sh b/near-rt-ric-simulator/scripts/start_simulator.sh
index d5da893c0ca44ca42d26359ee670948c774721a4..fa08b4fb3a3b880e68cdd9e132cf4725fe5fa1c1 100755
--- a/near-rt-ric-simulator/scripts/start_simulator.sh
+++ b/near-rt-ric-simulator/scripts/start_simulator.sh
@@ -5,9 +5,9 @@
 #  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.
@@ -18,9 +18,4 @@
 
 # One argument can be used along with the script call: it is the port on which one wish to run the simulator.
 
-if [ $# -eq 0 ]
-then
-  python3 ./main.py
-else
-  python3 ./main.py $1
-fi
+python3 ./main.py $*