Merge pull request #64 from ledgersmb/1.4

1.4
Updating for bug report 1205
Merging 1.4 from github
Merge pull request #319 from einhverfr/1.4

1.4