merged, added total time and distance

Signed-off-by: Adrian Matejov <a.matejov@centrum.sk>