Merge pull request #11 from ledgersmb/master

bringing up to date
Fixing assembly cogs issues
Merge pull request #97 from einhverfr/assembly_cogs_errors

Assembly cogs errors