added time tracking
Merge branch 'master' of https://github.com/EraYaN/MiDeRP