Merge pull request #98 from TheBlueMatt/2018-07-invalid-funding