Feature/asm-100

resolve bounty #100 and #104