Fix the case when discrtimestep is not an entire divisor of trajectory duration
Merge branch 'master' of https://github.com/quangounet/TOPP