implemented fix for issue #392
exp updates. updated calculating estimated duration
Merge branch 'release/v2.0.4' into develop