Merge pull request #191 from einhverfr/1.4

Merging changes from 1.3
Merge pull request #193 from einhverfr/1.4

Removing file_links dropping
Merge pull request #44 from ledgersmb/1.4

1.4