Feature/iteration 6 dev final estimate fix

Fixes issue #235