Added timing to output
Merge branch 'mfabel-develop-time' into mfabel-develop