Fix unit warnings during delays. Fixes #9
Merge branch 'dev'
Build 0.5.8