Makefile improved
Merge branch 'pure-asm'