Added delay related tools
Possible fix for #11
Delay test attempt for #18
Added fix for #18
Merge conflict