Merge pull request #71 from TheBlueMatt/2018-07-watch-funding