Merge branch 'issue_104' into financial