Minor changes
Time profiler class
Commit before merge
Commit before merge