Merge branch 'master' into cycle-times
Add cycle/cp times
Merge pull request #6 from impleri/cycle-times

Cycle times