merged latest improvements from Ajith and Ambar. This adds support for ASM examples