Merge pull request #1 from ledgersmb/master

bringing up to date
Merge pull request #8 from einhverfr/master

Merge pull request #1 from ledgersmb/master