diff --git a/hw6/grade.py b/hw6/grade.py
new file mode 100644
index 0000000000000000000000000000000000000000..d89837db998caa43bb7d4b3bf0b0d6e5d1e12eac
--- /dev/null
+++ b/hw6/grade.py
@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+# File       : grade.py
+# Description: Generate grading submission file
+# Copyright 2020 ETH Zurich. All Rights Reserved.
+
+'''
+Example:
+
+python grade.py -q1 7 -c1 "This is why I scored 7 points" -q2 20 -q3 15 -c3 "Second comment here" -c3 "More comments"
+'''
+
+#Modify this, according to a given homework
+exercise_conf = {
+    'Name' : 'Homework 6',
+    'Questions' : {
+        'Question 1': {'Total Points': 60},
+        'Question 2': {'Total Points': 40},
+        'Question 3': {'Total Points': 40},
+    }
+}
+
+
+
+
+'''
+==========================================
+Do not modify anything below this comment
+==========================================
+'''
+
+
+import argparse
+import datetime
+import sys
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+
+    for i in range(1, len(exercise_conf['Questions'])+1, 1):
+        parser.add_argument('-q{:d}'.format(i),'--question{:d}'.format(i),
+                type=int, default=0,
+                help='Scored points for Question {:d}'.format(i))
+        parser.add_argument('-c{:d}'.format(i),'--comment{:d}'.format(i),
+                type=str, action='append', nargs='*',
+                help='Comments for Question {:d} (you can add multiple comments)'.format(i))
+
+    return vars(parser.parse_args())
+
+if __name__ == "__main__":
+    args = parse_args()
+
+    grade = lambda s,m: 2.0 + (6.0-2.0) * float(s)/m
+    summary = {}
+    score = 0
+    maxpoints = 0
+    header = '{name:s}: {date:s}\n'.format(
+        name = exercise_conf['Name'], date = str(datetime.datetime.now()))
+    width = len(header.rstrip())
+    summary[0] = [header]
+    for i in range(1, len(exercise_conf['Questions'])+1, 1):
+        content = []
+        qscore  = args['question{:d}'.format(i)]
+        qmax    = exercise_conf['Questions']['Question {:d}'.format(i)]['Total Points']
+        qscore  = max(0 , min(qscore, qmax))
+        content.append( 'Question {id:d}: {score:d}/{max:d}\n'.format(
+            id = i, score = qscore, max = qmax)
+            )
+        comments = args['comment{:d}'.format(i)]
+        if comments is not None:
+            for j,comment in enumerate([s for x in comments for s in x]):
+                content.append( ' -Comment {id:d}: {issue:s}\n'.format(
+                    id = j+1, issue = comment.strip())
+                    )
+        for line in content:
+            width = width if len(line.rstrip())<width else len(line.rstrip())
+        score += qscore
+        maxpoints += qmax
+        summary[i] = content
+    assert maxpoints > 0
+    with open('grade.txt', 'w') as out:
+        out.write(width*'*'+'\n')
+        for lines in summary.values():
+            for line in lines:
+                out.write(line)
+            out.write(width*'*'+'\n')
+        out.write('Grade: {:.2f}'.format(grade(score, maxpoints)))