cleaned up timing
Merge branch 'master' of https://github.com/m-a-d-n-e-s-s/madness