Fixed tasks not resetting. Closes #150.
Fixed total time being horridly broken.
Merge branch 'release/v0.6.4' into develop