Merge pull request #150 from TheBlueMatt/2018-09-bolt7-compliance