Merge branch 'issue_168' into financial