Added a timer. Closes #12.