Merge pull request #126 from optout21/ldk-119