Merge branch 'issue_180' into financial