Used the right Stopwatch class and made sure that its started properly.

This commit belongs to issue #55.