Merge branch 'issue_126' into financial