Added time tracking, counting the number of operations performed.
Merge origin/master