diff --git a/lomes-app.py b/lomes-app.py
index 2a116cc..c83f6f8 100755
--- a/lomes-app.py
+++ b/lomes-app.py
@@ -1,14 +1,22 @@
 #!/bin/python3
 
 from flask import Flask, render_template
+import datetime
 import getpass
-import socket
+import os
 
 app = Flask(__name__)
 
 @app.route("/")
 def index():
-    user=getpass.getuser()
-    return render_template("index.html", user=user)
+    user = getpass.getuser()
+    preTime = datetime.datetime.now()
+    time = preTime.strftime("%H:%M:%S  -  %a %d.%m.%Y")
+    uname_fields = ("sysname", "nodename", "release", "version", "machine")
+    uname_info = os.uname()
+    sysinfo = "\n".join(f"{field}: {value}" for field, value in zip(uname_fields, uname_info))
+    lineBreak = sysinfo.replace("\n", "<br>")
 
-app.run(host="127.0.0.1", port=5000)
+    return render_template("index.html", user=user, time=time, sysinfo=sysinfo, content=lineBreak)
+
+app.run(host="127.0.0.1", port=5000, debug=True)
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 541c51f..67526ed 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -23,6 +23,8 @@
             <div class="confBox">
                 <ul>
                     <li>User executing flask : {{user}}</li>
+                    <li>Machine time : {{time}}</li>
+                    <li>System : {{sysinfo}}</li>
                 </ul>
             </div>
         </div>