Merge pull request #20 from Mardona-Team/Amr_Alaa_Integration

Amr alaa integration
assembler not tested
Merge pull request #21 from Mardona-Team/assembly

assembler not tested
Merge branch 'master' into Amr_Alaa_Integration