Merge pull request #154 from ariard/funding_created_refactor