Merge branches 'issue_141' and 'issue_142' into financial