Merge branch 'master' of github.com:d1b/blockfinder