Working Commit

Signed-off-by: Ntentos Stavros <ntentos@inf.uth.gr>