When initializing delay a time can now be set
Merge branch 'develop' into eq