Merge branch 'issue_110' into financial