Merge pull request #189 from einhverfr/master

Merging changes from 1.3 and 1.4
Merge pull request #194 from einhverfr/master

Removing file_links dropping
Merge pull request #43 from ledgersmb/master

up to date