fixed delays
Merge branch 'master' into addressing