made a few optimizations
fixed bug with match not recording time properly
Merge branch 'master' of github.com:mahyarr/rocket