DisAsm improvements
Merge two branches