financial: issue 104
Merge branch 'financial' into production