Merge pull request #131 from TheBlueMatt/2018-08-bolt-1-compliance