Adding time measurement
Merge branch 'master' of github.com:cosu/threepwood
Fix time measurement