minor change, time management variable is now global
Merge remote-tracking branch 'origin/master'