Assembly

Merge assembly code to master