fixed rel path for assembly
Merge remote-tracking branch 'origin'