matsjj Merge pull request #1 from lightning-core/matsjj