issue_56: adjustment for mortgage
Merge branch 'issue_56' into issue_3