Merge branches 'issue_110' and 'issue_112' into financial