Merge branch 'issue_83' into financial