Merge pull request #1 from ledgersmb/master

bringing up to date