Merge pull request #12 from ledgersmb/1.4

bringing this up to date
Fixing assembly cogs issues
Merge pull request #96 from einhverfr/1.4_assembly_cogs

1.4 assembly cogs