Added start/elapsed time
Merge branch 'elapsedtime' into develop