Closes #70
Closed #56 and #65. Related with #60 and #64
Merge branch 'estimate'
Working on #85
Changing the estimate report logic
Resolving merge