changed name of variable timestamp to duration
Merge remote-tracking branch 'origin/master'