Fixed timing issues
Merge branch 'master' of https://github.com/concurrent-things/software-project-day.git