Merge branches 'issue_104' and 'issue_105' into financial