Merge branch 'issue_138' into financial