fix bug - calculation of time is wrong
Merge branch 'master' into gh-pages